summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFei Long Wang <flwang@catalyst.net.nz>2015-02-11 12:14:29 +1300
committerFei Long Wang <flwang@catalyst.net.nz>2015-02-11 12:14:35 +1300
commit2b34bef7ce87929caa28e586bbaabeaa05d5f8a5 (patch)
treed6ec83cbb1c0f60b353701c93530682e91b02a6a
parent713eaf10312dc781947a5aa5f341d09b45ea12b1 (diff)
downloadglance-2b34bef7ce87929caa28e586bbaabeaa05d5f8a5.tar.gz
Remove is_public from reserved attribute in v2
In v2, we're using 'visibility' instead of 'is_public', so seems there is no good reason to keep 'is_public' as a reserved attribute. Closes-Bug: #1420501 Change-Id: Iba677979a2c1e8d45dcdc66394c5c9add51b7289
-rw-r--r--glance/api/v2/images.py3
-rw-r--r--glance/tests/unit/v2/test_images_resource.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py
index 2b02228bd..5d0385bb9 100644
--- a/glance/api/v2/images.py
+++ b/glance/api/v2/images.py
@@ -303,8 +303,7 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
_readonly_properties = ('created_at', 'updated_at', 'status', 'checksum',
'size', 'virtual_size', 'direct_url', 'self',
'file', 'schema')
- _reserved_properties = ('owner', 'is_public', 'location', 'deleted',
- 'deleted_at')
+ _reserved_properties = ('owner', 'location', 'deleted', 'deleted_at')
_base_properties = ('checksum', 'created_at', 'container_format',
'disk_format', 'id', 'min_disk', 'min_ram', 'name',
'size', 'virtual_size', 'status', 'tags',
diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py
index 553eb6af9..e96fe6043 100644
--- a/glance/tests/unit/v2/test_images_resource.py
+++ b/glance/tests/unit/v2/test_images_resource.py
@@ -2331,7 +2331,6 @@ class TestImagesDeserializer(test_utils.BaseTestCase):
def test_update_reserved_attributes(self):
samples = {
'owner': TENANT1,
- 'is_public': True,
'deleted': False,
'deleted_at': ISOTIME,
}