openstack/zun
Code Issues Proposed changes

Fixed an issue that container's host is None

Browse Source 
In before, if cpu and memory is not specified, the container's host
is not populated even if the claim succeeded. This commit fixed it.
In addition, add tempest test to verify it.

Change-Id: I2766e9539ecd1abf46f88f190600907fe6ff1021
Closes-Bug: #1701853
This commit is contained in:
Hongbin Lu 2017-07-01 21:46:01 +00:00
parent 5464b393fe
commit 58009529c9
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zun/compute/compute_node_tracker.py
View File

@ -81,6 +81,7 @@ class ComputeNodeTracker(object):
""" """
# No memory and cpu specified, no need to claim resource now. # No memory and cpu specified, no need to claim resource now.
if not (container.memory or container.cpu): if not (container.memory or container.cpu):
self._set_container_host(container)
return claims.NopClaim() return claims.NopClaim()
# We should have the compute node created here, just get it. # We should have the compute node created here, just get it.

35
zun/tests/tempest/api/common/datagen.py
View File

@ -47,24 +47,25 @@ def gen_url(scheme="http", domain="example.com", port=80):
return "%s://%s:%s" % (scheme, domain, port) return "%s://%s:%s" % (scheme, domain, port)
def container_data(**kwargs): def container_data(default_data=None, **kwargs):
data = { if default_data is None:
'name': data_utils.rand_name('container'), default_data = {
'image': 'cirros:latest', 'name': data_utils.rand_name('container'),
'command': 'sleep 10000', 'image': 'cirros:latest',
'cpu': 0.1, 'command': 'sleep 10000',
'memory': '100', 'cpu': 0.1,
'environment': {}, 'memory': '100',
'labels': {}, 'environment': {},
'image_driver': 'docker', 'labels': {},
'image_pull_policy': 'always', 'image_driver': 'docker',
'restart_policy': {'Name': 'no'}, 'image_pull_policy': 'always',
'workdir': '/', 'restart_policy': {'Name': 'no'},
'interactive': False 'workdir': '/',
} 'interactive': False
}
data.update(kwargs) default_data.update(kwargs)
model = container_model.ContainerEntity.from_dict(data) model = container_model.ContainerEntity.from_dict(default_data)
return model return model

11
zun/tests/tempest/api/test_containers.py
View File

@ -79,6 +79,11 @@ class TestContainer(base.BaseZunTest):
def test_run_container(self): def test_run_container(self):
self._run_container() self._run_container()
@decorators.idempotent_id('a2152d78-b6a6-4f47-8767-d83d29c6fb19')
def test_run_container_with_minimal_params(self):
gen_model = datagen.container_data({'image': 'nginx'})
self._run_container(gen_model=gen_model)
@decorators.idempotent_id('c32f93e3-da88-4c13-be38-25d2e662a28e') @decorators.idempotent_id('c32f93e3-da88-4c13-be38-25d2e662a28e')
def test_run_container_with_image_driver_glance(self): def test_run_container_with_image_driver_glance(self):
image = None image = None
@ -336,8 +341,9 @@ class TestContainer(base.BaseZunTest):
self.assertEqual('Created', self._get_container_state(model.uuid)) self.assertEqual('Created', self._get_container_state(model.uuid))
return resp, model return resp, model
def _run_container(self, **kwargs): def _run_container(self, gen_model=None, **kwargs):
gen_model = datagen.container_data(**kwargs) if gen_model is None:
gen_model = datagen.container_data(**kwargs)
resp, model = self.container_client.run_container(gen_model) resp, model = self.container_client.run_container(gen_model)
self.assertEqual(202, resp.status) self.assertEqual(202, resp.status)
# Wait for container to started # Wait for container to started
@ -348,6 +354,7 @@ class TestContainer(base.BaseZunTest):
resp, model = self.container_client.get_container(model.uuid) resp, model = self.container_client.get_container(model.uuid)
self.assertEqual('Running', model.status) self.assertEqual('Running', model.status)
self.assertEqual('Running', self._get_container_state(model.uuid)) self.assertEqual('Running', self._get_container_state(model.uuid))
self.assertIsNotNone(model.host)
return resp, model return resp, model
def _delete_container(self, container_id): def _delete_container(self, container_id):