openstack
/
cinder
Code Issues Proposed changes

Merge "Fix response when querying host detail by host name"

This commit is contained in:
Jenkins 2015-05-29 17:12:20 +00:00 committed by Gerrit Code Review
parent bed49f4b11 af853d479b
commit d4dc36d00a
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/db/sqlalchemy/api.py
View File

@ -1075,20 +1075,20 @@ def volume_create(context, values):
@require_admin_context
def volume_data_get_for_host(context, host, count_only=False):
host_attr = models.Volume.host
conditions = [host_attr == host, host_attr.op('LIKE')(host + '#%')]
if count_only:
result = model_query(context,
func.count(models.Volume.id),
read_deleted="no").\
filter_by(host=host).\
first()
read_deleted="no").filter(
or_(*conditions)).first()
return result[0] or 0
else:
result = model_query(context,
func.count(models.Volume.id),
func.sum(models.Volume.size),
read_deleted="no").\
filter_by(host=host).\
first()
read_deleted="no").filter(
or_(*conditions)).first()
# NOTE(vish): convert None to 0
return (result[0] or 0, result[1] or 0)

36
cinder/tests/unit/test_db_api.py
View File

@ -29,6 +29,10 @@ from cinder import test
CONF = cfg.CONF
THREE = 3
THREE_HUNDREDS = 300
ONE_HUNDREDS = 100
def _quota_reserve(context, project_id):
"""Create sample Quota, QuotaUsage and Reservation objects.
@ -264,23 +268,35 @@ class DBAPIVolumeTestCase(BaseTest):
self.assertEqual(attachment['attached_host'], host_name)
def test_volume_data_get_for_host(self):
for i in xrange(3):
for j in xrange(3):
db.volume_create(self.ctxt, {'host': 'h%d' % i, 'size': 100})
for i in xrange(3):
self.assertEqual((3, 300),
for i in xrange(THREE):
for j in xrange(THREE):
db.volume_create(self.ctxt, {'host': 'h%d' % i,
'size': ONE_HUNDREDS})
for i in xrange(THREE):
self.assertEqual((THREE, THREE_HUNDREDS),
db.volume_data_get_for_host(
self.ctxt, 'h%d' % i))
def test_volume_data_get_for_host_for_multi_backend(self):
for i in xrange(THREE):
for j in xrange(THREE):
db.volume_create(self.ctxt, {'host':
'h%d@lvmdriver-1#lvmdriver-1' % i,
'size': ONE_HUNDREDS})
for i in xrange(THREE):
self.assertEqual((THREE, THREE_HUNDREDS),
db.volume_data_get_for_host(
self.ctxt, 'h%d@lvmdriver-1' % i))
def test_volume_data_get_for_project(self):
for i in xrange(3):
for j in xrange(3):
for i in xrange(THREE):
for j in xrange(THREE):
db.volume_create(self.ctxt, {'project_id': 'p%d' % i,
'size': 100,
'size': ONE_HUNDREDS,
'host': 'h-%d-%d' % (i, j),
})
for i in xrange(3):
self.assertEqual((3, 300),
for i in xrange(THREE):
self.assertEqual((THREE, THREE_HUNDREDS),
db.volume_data_get_for_project(
self.ctxt, 'p%d' % i))