Merge "Validate string, integer limit for input parameter"

diff --cc cinder/api/contrib/consistencygroups.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_consistencygroups.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_qos_specs_manage.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_quotas.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_volume_manage.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_volume_transfer.py
index b70fe77b60b5f4a09ae204c33ff82bc27765cff3,1ff9461ac5be3c48e88ebba565e232eca99303ee..c3e40bbd726556bc640bd42d530c39a2c182dba0
--- 1/cinder/tests/unit/api/contrib/test_volume_transfer.py
--- 2/cinder/tests/unit/api/contrib/test_volume_transfer.py
+++ b/cinder/tests/unit/api/contrib/test_volume_transfer.py
@@@ -292,8 -298,10 +298,10 @@@ class VolumeTransferAPITestCase(test.Te
          self.assertTrue(transfer.item(0).hasAttribute('id'))
          self.assertTrue(transfer.item(0).hasAttribute('auth_key'))
          self.assertTrue(transfer.item(0).hasAttribute('created_at'))
 -        self.assertEqual(transfer.item(0).getAttribute('name'), 'transfer-001')
 +        self.assertEqual('transfer-001', transfer.item(0).getAttribute('name'))
          self.assertTrue(transfer.item(0).hasAttribute('volume_id'))
+         self.assertTrue(mock_validate.called)
+ 
          db.volume_destroy(context.get_admin_context(), volume_id)
  
      def test_create_transfer_with_no_body(self):

diff --cc cinder/tests/unit/api/openstack/test_wsgi.py
Simple merge