From 3e015b869789c7aeeb90e160ede3b3a7b7921f30 Mon Sep 17 00:00:00 2001
From: Brian Waldon <bcwaldon@gmail.com>
Date: 2012年1月11日 13:27:29 -0800
Subject: [PATCH] Remove 'location' from GlanceImageService
Glance no longer returns location through its public API, so we
should not attempt to display it. Addresses bug 911599.
Change-Id: I3400006eb6ab94095c0c2d2b5dc90cb9b7775a84
---
 .mailmap &#124; 1 +
 nova/image/glance.py &#124; 2 +-
 nova/tests/image/test_glance.py &#124; 6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.mailmap b/.mailmap
index c427c16681a5..e5ced35ebbaf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,7 @@
 <ant@openstack.org> <amesserl@rackspace.com>
 <armando.migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
 <brian.lamar@rackspace.com> <brian.lamar@gmail.com>
+<brian.waldon@rackspace.com> <bcwaldon@gmail.com>
 <bschott@isi.edu> <bfschott@gmail.com>
 <cbehrens@codestud.com> <chris.behrens@rackspace.com>
 <chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 9eea8eb4c35e..2a24d534ea83 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -435,7 +435,7 @@ def _convert_to_string(metadata):
 
 
 def _limit_attributes(image_meta):
- IMAGE_ATTRIBUTES = ['size', 'location', 'disk_format',
+ IMAGE_ATTRIBUTES = ['size', 'disk_format',
 'container_format', 'checksum', 'id',
 'name', 'created_at', 'updated_at',
 'deleted_at', 'deleted', 'status',
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 2ab1897f922f..5e9f9d79b7b0 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -129,7 +129,6 @@ class TestGlanceImageService(test.TestCase):
 'size': None,
 'min_disk': None,
 'min_ram': None,
- 'location': None,
 'disk_format': None,
 'container_format': None,
 'checksum': None,
@@ -161,7 +160,6 @@ class TestGlanceImageService(test.TestCase):
 'size': None,
 'min_disk': None,
 'min_ram': None,
- 'location': None,
 'disk_format': None,
 'container_format': None,
 'checksum': None,
@@ -311,7 +309,6 @@ class TestGlanceImageService(test.TestCase):
 'size': None,
 'min_disk': None,
 'min_ram': None,
- 'location': None,
 'disk_format': None,
 'container_format': None,
 'checksum': None,
@@ -356,7 +353,6 @@ class TestGlanceImageService(test.TestCase):
 'size': None,
 'min_disk': None,
 'min_ram': None,
- 'location': None,
 'disk_format': None,
 'container_format': None,
 'checksum': None,
@@ -436,7 +432,6 @@ class TestGlanceImageService(test.TestCase):
 'size': None,
 'min_disk': None,
 'min_ram': None,
- 'location': None,
 'disk_format': None,
 'container_format': None,
 'checksum': None,
@@ -472,7 +467,6 @@ class TestGlanceImageService(test.TestCase):
 'size': None,
 'min_disk': None,
 'min_ram': None,
- 'location': None,
 'disk_format': None,
 'container_format': None,
 'checksum': None,
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/nova/commit/3e015b869789c7aeeb90e160ede3b3a7b7921f30.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/nova/commit/3e015b869789c7aeeb90e160ede3b3a7b7921f30.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>