Merge "Advertise some of the StorPool driver's capabilities."

This commit is contained in:
Zuul 2019-09-09 16:56:56 +00:00 committed by Gerrit Code Review
commit 9daa5c6063
4 changed files with 20 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# Copyright 2014 - 2017 StorPool # Copyright 2014 - 2017, 2019 StorPool
# All Rights Reserved. # All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
@ -242,6 +242,12 @@ class StorPoolTestCase(test.TestCase):
for pool in stats['pools']: for pool in stats['pools']:
self.assertEqual(21, pool['total_capacity_gb']) self.assertEqual(21, pool['total_capacity_gb'])
self.assertEqual(5, int(pool['free_capacity_gb'])) self.assertEqual(5, int(pool['free_capacity_gb']))
self.assertTrue(pool['multiattach'])
self.assertFalse(pool['QoS_support'])
self.assertFalse(pool['thick_provisioning_support'])
self.assertTrue(pool['thin_provisioning_support'])
if pool['pool_name'] != 'default': if pool['pool_name'] != 'default':
m = r.match(pool['pool_name']) m = r.match(pool['pool_name'])
self.assertIsNotNone(m) self.assertIsNotNone(m)

View File

@ -1,4 +1,4 @@
# Copyright (c) 2014 - 2017 StorPool # Copyright (c) 2014 - 2019 StorPool
# All Rights Reserved. # All Rights Reserved.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
@ -90,10 +90,10 @@ class StorPoolDriver(driver.VolumeDriver):
fix the docstring formatting fix the docstring formatting
1.2.2 - Reintroduce the driver into OpenStack Queens, 1.2.2 - Reintroduce the driver into OpenStack Queens,
add ignore_errors to the internal _detach_volume() method add ignore_errors to the internal _detach_volume() method
1.2.3 - Advertise some more driver capabilities.
""" """
VERSION = '1.2.1' VERSION = '1.2.3'
CI_WIKI_NAME = 'StorPool_CI' CI_WIKI_NAME = 'StorPool_CI'
# TODO(jsbryant) Remove driver in the 'U' release if CI is not fixed. # TODO(jsbryant) Remove driver in the 'U' release if CI is not fixed.
@ -297,7 +297,10 @@ class StorPoolDriver(driver.VolumeDriver):
'total_capacity_gb': total / units.Gi, 'total_capacity_gb': total / units.Gi,
'free_capacity_gb': free / units.Gi, 'free_capacity_gb': free / units.Gi,
'reserved_percentage': 0, 'reserved_percentage': 0,
'multiattach': True,
'QoS_support': False, 'QoS_support': False,
'thick_provisioning_support': False,
'thin_provisioning_support': True,
} }
pools = [dict(space, pool_name='default')] pools = [dict(space, pool_name='default')]

View File

@ -662,7 +662,7 @@ driver.quobyte=missing
driver.rbd=complete driver.rbd=complete
driver.seagate=missing driver.seagate=missing
driver.sheepdog=missing driver.sheepdog=missing
driver.storpool=missing driver.storpool=complete
driver.synology=missing driver.synology=missing
driver.vrtsaccess=missing driver.vrtsaccess=missing
driver.vrtscnfs=missing driver.vrtscnfs=missing
@ -800,7 +800,7 @@ driver.quobyte=missing
driver.rbd=complete driver.rbd=complete
driver.seagate=complete driver.seagate=complete
driver.sheepdog=missing driver.sheepdog=missing
driver.storpool=missing driver.storpool=complete
driver.synology=missing driver.synology=missing
driver.vrtsaccess=missing driver.vrtsaccess=missing
driver.vrtscnfs=missing driver.vrtscnfs=missing

View File

@ -0,0 +1,5 @@
---
features:
- |
The StorPool driver enables the ``multiattach`` and ``thin_provisioning``
capabilities.