Merge "Validate name and description string"

diff --cc cinder/api/v2/snapshots.py
Simple merge

diff --cc cinder/tests/unit/api/contrib/test_backups.py
index b580217828b5493389c4cb789d39acfb7c4a9c95,033d33aac8715205caf971b45e75d5dd7b64b80a..e1f335e9bc89f7a7ad1076ee14376837ad467505
--- 1/cinder/tests/unit/api/contrib/test_backups.py
--- 2/cinder/tests/unit/api/contrib/test_backups.py
+++ b/cinder/tests/unit/api/contrib/test_backups.py
@@@ -400,9 -403,10 +403,10 @@@ class BackupsAPITestCase(test.TestCase)
  
          res_dict = json.loads(res.body)
  
 -        self.assertEqual(res.status_int, 202)
 +        self.assertEqual(202, res.status_int)
          self.assertIn('id', res_dict['backup'])
          self.assertTrue(_mock_service_get_all_by_topic.called)
+         self.assertTrue(mock_validate.called)
  
          db.volume_destroy(context.get_admin_context(), volume_id)
  
@@@ -492,9 -499,10 +499,10 @@@
          res = req.get_response(fakes.wsgi_app())
  
          res_dict = json.loads(res.body)
 -        self.assertEqual(res.status_int, 202)
 +        self.assertEqual(202, res.status_int)
          self.assertIn('id', res_dict['backup'])
          self.assertTrue(_mock_service_get_all_by_topic.called)
+         self.assertTrue(mock_validate.called)
  
          db.volume_destroy(context.get_admin_context(), volume_id)
  

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

diff --cc cinder/tests/unit/api/v2/test_volumes.py
Simple merge