openstack/zun
Code Issues Proposed changes

Merge "Refactor _populate_container method"

Browse Source
This commit is contained in:
Jenkins 2017-10-04 21:40:39 +00:00 committed by Gerrit Code Review
commit 20b2048c8d
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zun/container/docker/driver.py
View File

@ -334,7 +334,22 @@ class DockerDriver(driver.ContainerDriver):
def _populate_container(self, container, response):
state = response.get('State')
if type(state) is dict:
self._populate_container_state(container, state)
config = response.get('Config')
if config:
self._populate_hostname_and_ports(container, config)
self._populate_command(container, config)
hostconfig = response.get('HostConfig')
if hostconfig:
container.runtime = hostconfig.get('Runtime')
def _populate_container_state(self, container, state):
if not state:
container.status = consts.UNKNOWN
container.status_detail = None
elif type(state) is dict:
status_detail = ''
if state.get('Error'):
container.status = consts.ERROR
@ -385,15 +400,6 @@ class DockerDriver(driver.ContainerDriver):
container.status = consts.UNKNOWN
container.status_detail = None
config = response.get('Config')
if config:
self._populate_hostname_and_ports(container, config)
self._populate_command(container, config)
hostconfig = response.get('HostConfig')
if hostconfig:
container.runtime = hostconfig.get('Runtime')
def _populate_command(self, container, config):
command_list = config.get('Cmd')
command_str = None