Merge lp:~vishvananda/nova/fix-volume-smoketest into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Uses the proc filesystem to check the volume size in volume smoketests so that it works with a very limited busybox image.

[Devin Carlen (devcamcar)]

approving, but could you add a note for what this means? Starting to look pretty arbitrary :)

13 + expected_size = 1024 * 1024 * 1024 / 512

review: Approve

[lp:~vishvananda/nova/fix-volume-smoketest]

906. By Vish Ishaya on 2011-03-28

add note per review

[Vish Ishaya (vishvananda)]

good point, added.

Vish

On Mar 28, 2011, at 4:47 PM, Devin Carlen wrote:

> Review: Approve
> approving, but could you add a note for what this means? Starting to look pretty arbitrary :)
>
> 13 + expected_size = 1024 * 1024 * 1024 / 512
>
>
> --
> https://code.launchpad.net/~vishvananda/nova/fix-volume-smoketest/+merge/55252
> You are the owner of lp:~vishvananda/nova/fix-volume-smoketest.

[Jay Pipes (jaypipes)]

This may be a stoopid question (sorry if it is), but is this pidgeon-holing the test_sysadmin smoketest to only working with a specific image with a specific size?

review: Needs Information

[Soren Hansen (soren)]

> This may be a stoopid question (sorry if it is), but is this pidgeon-holing
> the test_sysadmin smoketest to only working with a specific image with a
> specific size?

No, we create a volume of a specific size, attach it to an instance, and from the instance verify that the volume's size is as we expected it to be.

lgtm

review: Approve

[Jay Pipes (jaypipes)]

> > This may be a stoopid question (sorry if it is), but is this pidgeon-holing
> > the test_sysadmin smoketest to only working with a specific image with a
> > specific size?
>
> No, we create a volume of a specific size, attach it to an instance, and from
> the instance verify that the volume's size is as we expected it to be.

OK, thanks for the answer, Soren. I was confusing checking the size of the image with the size of a volume... too many Glance test cases in the back of my mind I guess...

review: Approve

=== modified file 'smoketests/test_sysadmin.py'
--- smoketests/test_sysadmin.py	2011-03-20 19:04:51 +0000
+++ smoketests/test_sysadmin.py	2011-03-28 23:51:32 +0000
@@ -266,10 +266,11 @@
         ip = self.data['instance'].private_dns_name
         conn = self.connect_ssh(ip, TEST_KEY)
         stdin, stdout, stderr = conn.exec_command(
-            "blockdev --getsize64 %s" % self.device)
+            "cat /sys/class/block/%s/size" % self.device.rpartition('/')[2])
         out = stdout.read().strip()
         conn.close()
-        expected_size = 1024 * 1024 * 1024
+        # NOTE(vish): 1G bytes / 512 bytes per block
+        expected_size = 1024 * 1024 * 1024 / 512
         self.assertEquals('%s' % (expected_size,), out,
                           'Volume is not the right size: %s %s. Expected: %s' %
                           (out, stderr.read(), expected_size))