openstack
diff --git a/‎nova/api/openstack/compute/schemas/servers.py‎
Lines changed: 3 additions & 3 deletions b/‎nova/api/openstack/compute/schemas/servers.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎nova/tests/unit/api/openstack/compute/test_volumes.py‎
Lines changed: 1 addition & 1 deletion b/‎nova/tests/unit/api/openstack/compute/test_volumes.py‎
Lines changed: 1 addition & 1 deletion
@@ -27,11 +27,11 @@
         'volume_id': parameter_types.volume_id,
         'snapshot_id': parameter_types.image_id,
         'volume_size': parameter_types.volume_size,
-        # Do not allow empty device names and number values and
-        # containing spaces(defined in nova/block_device.py:from_api())
+        # Do not allow empty device names or spaces in name (defined in
+        # nova/block_device.py:validate_device_name())
         'device_name': {
             'type': 'string', 'minLength': 1, 'maxLength': 255,
-            'pattern': '^[a-zA-Z0-9._-r/]*$',
+            'pattern': '^[a-zA-Z0-9._/-]*$',
         },
         # Defined as boolean in nova/block_device.py:from_api()
         'delete_on_termination': parameter_types.boolean,
 
@@ -245,7 +245,7 @@ def test_create_root_volume_bdm_v2_reproducer_2114951(self):
         req.body = jsonutils.dump_as_bytes(body)
         req.headers['content-type'] = 'application/json'
         res = req.get_response(fakes.wsgi_app_v21())
-        self.assertEqual(400, res.status_int)
+        self.assertEqual(202, res.status_int)
 
 
 class VolumeApiTestV21(test.NoDBTestCase):