138875b7c3
Storage capabilities is used to indicate the static and dynamic ability of the storage driver object based on current driver implementation or particular driver configuration and backend status. Use storage capabilities glance_store can do more proper operations on backend to support upper layer request, like to enable or disable add() function to glance, or if allow glance reuse driver instance for all request according to whether the driver and/or backend is stateless. This patch implemented some initial capabilities for existing drivers, and change the foundational code to make them be aware. Mainly it contains: 1. Implemented essential code to enable driver capabilities, adding necessary capabilities. 2. Added a generic checker on necessary storage operations, to make sure the capabilities of the driver are capable of handling requested operation. We can enhance the check logic as needed easily in future. 3. Added a callback based schedule logic to update dynamic capabilities of store when operator enabled it by a option. 4. Refactoring on existing disablement logic on driver add() interface, to use consistent capabilities way to handle it, removed add_disabled(). 5. Therefor the related exception conversion logic for other interfaces are redundant, due to now we can raise proper exception directly from the checker. 6. Added the logic to recreate drive object if the storage and/or driver isn't stateless. Few minor changes need to be added to Glance side: Change Ibbc85b6bc2ea98c564d316db2874d7df5aac32a6 . docImpact Implements: blueprint store-capabilities Change-Id: Iedf0d4f829e46ca64c3f4fc6a7dfee54d9b0605b Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
56 lines
1.9 KiB
Python
56 lines
1.9 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import StringIO
|
|
|
|
import mock
|
|
from oslo_concurrency import processutils
|
|
|
|
from glance_store._drivers import sheepdog
|
|
from glance_store.tests import base
|
|
from tests.unit import test_store_capabilities
|
|
|
|
|
|
class TestSheepdogStore(base.StoreBaseTest,
|
|
test_store_capabilities.TestStoreCapabilitiesChecking):
|
|
|
|
def setUp(self):
|
|
"""Establish a clean test environment."""
|
|
super(TestSheepdogStore, self).setUp()
|
|
|
|
def _fake_execute(*cmd, **kwargs):
|
|
pass
|
|
|
|
self.config(default_store='sheepdog',
|
|
group='glance_store')
|
|
|
|
execute = mock.patch.object(processutils, 'execute').start()
|
|
execute.side_effect = _fake_execute
|
|
self.addCleanup(execute.stop)
|
|
self.store = sheepdog.Store(self.conf)
|
|
self.store.configure()
|
|
|
|
def test_cleanup_when_add_image_exception(self):
|
|
called_commands = []
|
|
|
|
def _fake_run_command(command, data, *params):
|
|
called_commands.append(command)
|
|
|
|
with mock.patch.object(sheepdog.SheepdogImage, '_run_command') as cmd:
|
|
cmd.side_effect = _fake_run_command
|
|
data = StringIO.StringIO('xx')
|
|
self.store.add('fake_image_id', data, 2)
|
|
self.assertEqual(called_commands, ['list -r', 'create', 'write'])
|