d8c307a36a
This removes the majority of the nova-volume code from the codebase. It updates relevent config options to default to cinder. It updates a number of existing tests that were depending on code that was removed. A few things still need to be removed: * volume/driver.py & volume/iscsi.py These files are used by the libvirt volume driver tests. These tests should be updated to mock the relevant calls. * scheduler/simple.py & scheduler/multi.py These files should no longer be necessary so they can be removed in a subsequent patch * exception.py cleanup Once the above files are removed there are a number of unused exceptions which can be removed * database calls and database tables The database calls have not been removed and the tables have not been dropped. This can be done in a separate migration * additional config options and nova.conf.sample There may be a few extra config options that can be removed and the conf sample can be regenerated Implements bp delete-nova-volume Change-Id: I0b540e54dbabd26901a7530035a38583bb521fda
88 lines
2.7 KiB
Python
88 lines
2.7 KiB
Python
# Copyright 2011 OpenStack LLC.
|
|
# 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 pkg_resources
|
|
|
|
from nova.api.openstack.compute import extensions as computeextensions
|
|
from nova.api.openstack import extensions
|
|
from nova.openstack.common.plugin import plugin
|
|
from nova import test
|
|
|
|
|
|
class StubController(object):
|
|
|
|
def i_am_the_stub(self):
|
|
pass
|
|
|
|
|
|
class StubControllerExtension(extensions.ExtensionDescriptor):
|
|
"""This is a docstring. We need it."""
|
|
name = 'stubextension'
|
|
alias = 'stubby'
|
|
|
|
def get_resources(self):
|
|
resources = []
|
|
res = extensions.ResourceExtension('testme',
|
|
StubController())
|
|
resources.append(res)
|
|
return resources
|
|
|
|
|
|
service_list = []
|
|
|
|
|
|
class TestPluginClass(plugin.Plugin):
|
|
|
|
def __init__(self, service_name):
|
|
super(TestPluginClass, self).__init__(service_name)
|
|
self._add_api_extension_descriptor(StubControllerExtension)
|
|
service_list.append(service_name)
|
|
|
|
|
|
class MockEntrypoint(pkg_resources.EntryPoint):
|
|
def load(self):
|
|
return TestPluginClass
|
|
|
|
|
|
class APITestCase(test.TestCase):
|
|
"""Test case for the plugin api extension interface"""
|
|
def test_add_extension(self):
|
|
def mock_load(_s):
|
|
return TestPluginClass()
|
|
|
|
def mock_iter_entry_points(_t):
|
|
return [MockEntrypoint("fake", "fake", ["fake"])]
|
|
|
|
self.stubs.Set(pkg_resources, 'iter_entry_points',
|
|
mock_iter_entry_points)
|
|
global service_list
|
|
service_list = []
|
|
|
|
# Marking out the default extension paths makes this test MUCH faster.
|
|
self.flags(osapi_compute_extension=[])
|
|
|
|
found = False
|
|
mgr = computeextensions.ExtensionManager()
|
|
for res in mgr.get_resources():
|
|
# We have to use this weird 'dir' check because
|
|
# the plugin framework muddies up the classname
|
|
# such that 'isinstance' doesn't work right.
|
|
if 'i_am_the_stub' in dir(res.controller):
|
|
found = True
|
|
|
|
self.assertTrue(found)
|
|
self.assertEqual(len(service_list), 1)
|
|
self.assertEqual(service_list[0], 'compute-extensions')
|