Merge "Populate container fields for new container"
This commit is contained in:
commit
ded601dd03
|
@ -195,8 +195,8 @@ class DockerDriver(driver.ContainerDriver):
|
||||||
context, container, requested_networks, network_api)
|
context, container, requested_networks, network_api)
|
||||||
container.addresses = addresses
|
container.addresses = addresses
|
||||||
|
|
||||||
container.status = consts.CREATED
|
response = docker.inspect_container(container.container_id)
|
||||||
container.status_reason = None
|
self._populate_container(container, response)
|
||||||
container.save(context)
|
container.save(context)
|
||||||
return container
|
return container
|
||||||
|
|
||||||
|
|
|
@ -100,8 +100,12 @@ class TestDockerDriver(base.DriverTestCase):
|
||||||
return_value={'Id': 'val1', 'key1': 'val2'})
|
return_value={'Id': 'val1', 'key1': 'val2'})
|
||||||
self.mock_docker.create_networking_config = mock.Mock(
|
self.mock_docker.create_networking_config = mock.Mock(
|
||||||
return_value={'Id': 'val1', 'key1': 'val2'})
|
return_value={'Id': 'val1', 'key1': 'val2'})
|
||||||
|
self.mock_docker.inspect_container = mock.Mock(
|
||||||
|
return_value={'State': 'created',
|
||||||
|
'Config': {'Cmd': ['fake_command']}})
|
||||||
image = {'path': '', 'image': '', 'repo': '', 'tag': ''}
|
image = {'path': '', 'image': '', 'repo': '', 'tag': ''}
|
||||||
mock_container = self.mock_default_container
|
mock_container = self.mock_default_container
|
||||||
|
mock_container.status = 'Creating'
|
||||||
networks = [{'network': 'fake-network'}]
|
networks = [{'network': 'fake-network'}]
|
||||||
volumes = []
|
volumes = []
|
||||||
fake_port = {'mac_address': 'fake_mac'}
|
fake_port = {'mac_address': 'fake_mac'}
|
||||||
|
|
Loading…
Reference in New Issue