openstack/zun
Code Issues Proposed changes

Merge "Allow duplicated container name by default"

Browse Source
This commit is contained in:
Zuul 2017-11-28 00:58:20 +00:00 committed by Gerrit Code Review
commit 4d9c92a6af
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zun/conf/compute.py
View File

@ -25,7 +25,7 @@ service_opts = [
db_opts = [
cfg.StrOpt(
'unique_container_name_scope',
default='project',
default='',
choices=['', 'project', 'global'],
help="""
Sets the scope of the check for unique container names.

4
zun/tests/unit/db/test_container.py
View File

@ -200,6 +200,8 @@ class DbContainerTestCase(base.DbTestCase):
self.assertEqual(new_image, res.image)
def test_update_container_with_the_same_name(self):
CONF.set_override("unique_container_name_scope", "project",
group="compute")
container1 = utils.create_test_container(
name='container-one',
uuid=uuidutils.generate_uuid(),
@ -412,6 +414,8 @@ class EtcdDbContainerTestCase(base.DbTestCase):
@mock.patch.object(etcd_client, 'update')
def test_update_container_with_the_same_name(self, mock_update,
mock_write, mock_read):
CONF.set_override("unique_container_name_scope", "project",
group="compute")
mock_read.side_effect = etcd.EtcdKeyNotFound
container1 = utils.create_test_container(
name='container-one',