Merge lp:~jaypipes/glance/bug767203 into lp:~hudson-openstack/glance/trunk

[Jay Pipes]

Adds a test case for updating an image's Name attribute. glance update was not regarding 'name' as a top-level modifiable attribute...

[Brian Waldon (bcwaldon)]

Looks good.

review: Approve

[Dan Prince (dan-prince)]

Works great.

review: Approve

[Édouard Thuleau (ethuleau)]

review: Approve

=== modified file 'bin/glance'
--- bin/glance	2011-04-08 02:11:49 +0000
+++ bin/glance	2011-04-20 19:19:08 +0000
@@ -232,6 +232,7 @@
 Field names that can be specified:
 
 name                A name for the image.
+location            The location of the image.
 is_public           If specified, interpreted as a boolean value
                     and sets or unsets the image's availability to the public.
 disk_format         Format of the disk image
@@ -263,7 +264,7 @@
             print 'Found non-modifiable field %s. Removing.' % field
             fields.pop(field)
 
-    base_image_fields = ['disk_format', 'container_format',
+    base_image_fields = ['disk_format', 'container_format', 'name',
                          'location']
     for field in base_image_fields:
         fvalue = fields.pop(field, None)

=== modified file 'tests/functional/test_bin_glance.py'
--- tests/functional/test_bin_glance.py	2011-04-20 17:27:02 +0000
+++ tests/functional/test_bin_glance.py	2011-04-20 19:19:08 +0000
@@ -91,7 +91,7 @@
 
     def test_add_list_update_list(self):
         """
-        Test for LP Bug #736295
+        Test for LP Bugs #736295, #767203
         We test the following:
 
             0. Verify no public images in index
@@ -99,6 +99,8 @@
             2. Check that image does not appear in index
             3. Update the image to be public
             4. Check that image now appears in index
+            5. Update the image's Name attribute
+            6. Verify the updated name is shown
         """
 
         self.cleanup()
@@ -149,6 +151,24 @@
         image_data_line = lines[3]
         self.assertTrue('MyImage' in image_data_line)
 
+        # 5. Update the image's Name attribute
+        updated_image_name = "Updated image name"
+        cmd = "bin/glance --port=%d update 1 is_public=True name=\"%s\"" \
+                % (api_port, updated_image_name)
+
+        exitcode, out, err = execute(cmd)
+
+        self.assertEqual(0, exitcode)
+        self.assertEqual('Updated image 1', out.strip())
+
+        # 6. Verify updated name shown
+        cmd = "bin/glance --port=%d index" % api_port
+        exitcode, out, err = execute(cmd)
+
+        self.assertEqual(0, exitcode)
+        self.assertTrue(updated_image_name in out,
+                        "%s not found in %s" % (updated_image_name, out))
+
         self.stop_servers()
 
     @functional.runs_sql