Merge lp:~anso/nova/validate-device-attach-disk into lp:~hudson-openstack/nova/trunk

[Jesse Andrews]

validates device parameter for attach-volume

[Jay Pipes (jaypipes)]

Good, but how about a tiny bit more descriptive in the error message?

Instead of:

17 + raise exception.ApiError("Invalid device. Example /dev/vdb")

how about:

17 + raise exception.ApiError("Invalid device specified: %s. Example device: /dev/vdb" % device)

[lp:~anso/nova/validate-device-attach-disk]

377. By Jesse Andrews on 2010-10-25

update error message

[Jay Pipes (jaypipes)]

rock on :)

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2010-10-21 22:26:06 +0000
+++ nova/api/ec2/cloud.py	2010-10-25 17:46:00 +0000
@@ -25,6 +25,7 @@
 import base64
 import datetime
 import logging
+import re
 import os
 import time
 
@@ -519,6 +520,9 @@
 
     def attach_volume(self, context, volume_id, instance_id, device, **kwargs):
         volume_ref = db.volume_get_by_ec2_id(context, volume_id)
+        if not re.match("^/dev/[a-z]d[a-z]+$", device):
+            raise exception.ApiError("Invalid device specified: %s. "
+                                     "Example device: /dev/vdb" % device)
         # TODO(vish): abstract status checking?
         if volume_ref['status'] != "available":
             raise exception.ApiError("Volume status must be available")