openstack/zun
Code Issues Proposed changes

Merge "Consolidate container api test cases (part2)"

Browse Source
This commit is contained in:
Zuul 2018-02-27 04:48:17 +00:00 committed by Gerrit Code Review
commit aa3d4a3c8c
1 changed files with 10 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
zun/tests/unit/api/controllers/v1/test_containers.py
View File

@ -268,80 +268,15 @@ class TestContainerController(api_base.FunctionalTest):
@patch('zun.network.neutron.NeutronAPI.get_available_network') @patch('zun.network.neutron.NeutronAPI.get_available_network')
@patch('zun.compute.api.API.container_create') @patch('zun.compute.api.API.container_create')
@patch('zun.compute.api.API.image_search') @patch('zun.compute.api.API.image_search')
def test_create_container_without_memory(self, mock_search, def test_create_container_with_minimum_params(self,
mock_container_create, mock_search,
mock_neutron_get_network):
mock_container_create.side_effect = lambda x, y, **z: y
fake_network = {'id': 'foo'}
mock_neutron_get_network.return_value = fake_network
# Create a container with a command
params = ('{"name": "MyDocker", "image": "ubuntu",'
'"command": "env",'
'"environment": {"key1": "val1", "key2": "val2"}}')
response = self.post('/v1/containers/',
params=params,
content_type='application/json')
self.assertEqual(202, response.status_int)
response = self.get('/v1/containers/')
self.assertEqual(200, response.status_int)
self.assertEqual(2, len(response.json))
c = response.json['containers'][0]
self.assertIsNotNone(c.get('uuid'))
self.assertEqual('MyDocker', c.get('name'))
self.assertEqual('env', c.get('command'))
self.assertIsNone(c.get('memory'))
self.assertEqual({"key1": "val1", "key2": "val2"},
c.get('environment'))
mock_neutron_get_network.assert_called_once()
requested_networks = \
mock_container_create.call_args[1]['requested_networks']
self.assertEqual(1, len(requested_networks))
self.assertEqual(fake_network['id'], requested_networks[0]['network'])
@patch('zun.network.neutron.NeutronAPI.get_available_network')
@patch('zun.compute.api.API.container_create')
@patch('zun.compute.api.API.image_search')
def test_create_container_without_environment(self, mock_search,
mock_container_create, mock_container_create,
mock_neutron_get_network): mock_neutron_get_network):
mock_container_create.side_effect = lambda x, y, **z: y mock_container_create.side_effect = lambda x, y, **z: y
fake_network = {'id': 'foo'} fake_network = {'id': 'foo'}
mock_neutron_get_network.return_value = fake_network mock_neutron_get_network.return_value = fake_network
# Create a container with a command # Create a container with a command
params = ('{"name": "MyDocker", "image": "ubuntu",' params = ('{"image": "ubuntu"}')
'"command": "env", "memory": "512"}')
response = self.post('/v1/containers/',
params=params,
content_type='application/json')
self.assertEqual(202, response.status_int)
# get all containers
response = self.get('/v1/containers/')
self.assertEqual(200, response.status_int)
self.assertEqual(2, len(response.json))
c = response.json['containers'][0]
self.assertIsNotNone(c.get('uuid'))
self.assertEqual('MyDocker', c.get('name'))
self.assertEqual('env', c.get('command'))
self.assertEqual('512M', c.get('memory'))
self.assertEqual({}, c.get('environment'))
mock_neutron_get_network.assert_called_once()
requested_networks = \
mock_container_create.call_args[1]['requested_networks']
self.assertEqual(1, len(requested_networks))
self.assertEqual(fake_network['id'], requested_networks[0]['network'])
@patch('zun.network.neutron.NeutronAPI.get_available_network')
@patch('zun.compute.api.API.container_create')
@patch('zun.compute.api.API.image_search')
def test_create_container_without_name(self, mock_search,
mock_container_create,
mock_neutron_get_network):
# No name param
mock_container_create.side_effect = lambda x, y, **z: y
fake_network = {'id': 'foo'}
mock_neutron_get_network.return_value = fake_network
params = ('{"image": "ubuntu", "command": "env", "memory": "512",'
'"environment": {"key1": "val1", "key2": "val2"}}')
response = self.post('/v1/containers/', response = self.post('/v1/containers/',
params=params, params=params,
content_type='application/json') content_type='application/json')
@ -352,10 +287,13 @@ class TestContainerController(api_base.FunctionalTest):
c = response.json['containers'][0] c = response.json['containers'][0]
self.assertIsNotNone(c.get('uuid')) self.assertIsNotNone(c.get('uuid'))
self.assertIsNotNone(c.get('name')) self.assertIsNotNone(c.get('name'))
self.assertEqual('env', c.get('command')) self.assertIsNone(c.get('command'))
self.assertEqual('512M', c.get('memory')) self.assertIsNone(c.get('memory'))
self.assertEqual({"key1": "val1", "key2": "val2"}, self.assertEqual({}, c.get('environment'))
c.get('environment')) self.assertIsNone(c.get('runtime'))
self.assertIsNone(c.get('hostname'))
self.assertEqual(0, c.get('disk'))
self.assertEqual({}, c.get('restart_policy'))
mock_neutron_get_network.assert_called_once() mock_neutron_get_network.assert_called_once()
requested_networks = \ requested_networks = \
mock_container_create.call_args[1]['requested_networks'] mock_container_create.call_args[1]['requested_networks']