openstack/glance
Code Issues Proposed changes

Merge "Redact location from notifications"

Browse Source
This commit is contained in:
Jenkins
2013-02-26 19:04:06 +00:00
committed by Gerrit Code Review
parent d24e6085bb 7bdc4eb94a
commit 89d8441d12
4 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
glance/tests/unit/test_notifier.py
View File

@@ -448,7 +448,8 @@ class TestImageNotifications(utils.BaseTestCase):
created_at=DATETIME, updated_at=DATETIME, owner=TENANT1,
visibility='public', container_format='ami',
tags=['one', 'two'], disk_format='ami', min_ram=128,
min_disk=10, checksum='ca425b88f047ce8ec45ee90e813ada91')
min_disk=10, checksum='ca425b88f047ce8ec45ee90e813ada91',
location='http://127.0.0.1')
self.context = glance.context.RequestContext(tenant=TENANT2,
user=USER1)
self.image_repo_stub = ImageRepoStub()
@@ -467,6 +468,8 @@ class TestImageNotifications(utils.BaseTestCase):
self.assertEqual(output_log['notification_type'], 'INFO')
self.assertEqual(output_log['event_type'], 'image.update')
self.assertEqual(output_log['payload']['id'], self.image.image_id)
if 'location' in output_log['payload']:
self.fail('Notification contained location field.')
def test_image_add_notification(self):
self.image_repo_proxy.add(self.image)
@@ -476,6 +479,8 @@ class TestImageNotifications(utils.BaseTestCase):
self.assertEqual(output_log['notification_type'], 'INFO')
self.assertEqual(output_log['event_type'], 'image.create')
self.assertEqual(output_log['payload']['id'], self.image.image_id)
if 'location' in output_log['payload']:
self.fail('Notification contained location field.')
def test_image_delete_notification(self):
self.image_repo_proxy.remove(self.image)
@@ -486,6 +491,8 @@ class TestImageNotifications(utils.BaseTestCase):
self.assertEqual(output_log['event_type'], 'image.delete')
self.assertEqual(output_log['payload']['id'], self.image.image_id)
self.assertTrue(output_log['payload']['deleted'])
if 'location' in output_log['payload']:
self.fail('Notification contained location field.')
def test_image_get(self):
image = self.image_repo_proxy.get(UUID1)

22
glance/tests/unit/v1/test_api.py
View File

@@ -16,6 +16,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import copy
import datetime
import hashlib
import httplib
@@ -3441,3 +3442,24 @@ class TestImageSerializer(base.IsolatedUnitTest):
self.serializer.notifier)
self.assertTrue(called['notified'])
def test_redact_location(self):
"""Ensure location redaction does not change original metadata"""
image_meta = {'size': 3, 'id': '123', 'location': 'http://localhost'}
redacted_image_meta = {'size': 3, 'id': '123'}
copy_image_meta = copy.deepcopy(image_meta)
tmp_image_meta = glance.api.v1.images.redact_loc(image_meta)
self.assertEqual(image_meta, copy_image_meta)
self.assertEqual(tmp_image_meta, redacted_image_meta)
def test_noop_redact_location(self):
"""Check no-op location redaction does not change original metadata"""
image_meta = {'size': 3, 'id': '123'}
redacted_image_meta = {'size': 3, 'id': '123'}
copy_image_meta = copy.deepcopy(image_meta)
tmp_image_meta = glance.api.v1.images.redact_loc(image_meta)
self.assertEqual(image_meta, copy_image_meta)
self.assertEqual(tmp_image_meta, redacted_image_meta)
self.assertEqual(image_meta, redacted_image_meta)