Move volume manager specific handlers into extensions directory

Implements blueprint: volume-manager-refactoring

Change-Id: I3a627f5625a0589252ff903aaa9930163bfc255c
This commit is contained in:
Evgeniy L 2015-06-24 18:12:15 +03:00
parent 9ecd2645d8
commit 50a3b5c4e4
5 changed files with 20 additions and 6 deletions

View File

@ -28,7 +28,7 @@ Nodes API
Disks API
---------
.. automodule:: nailgun.api.v1.handlers.disks
.. automodule:: nailgun.extensions.volume_manager.handlers.disks
:inherited-members:

View File

@ -35,9 +35,14 @@ from nailgun.api.v1.handlers.cluster import ClusterUpdateHandler
from nailgun.api.v1.handlers.cluster import VmwareAttributesDefaultsHandler
from nailgun.api.v1.handlers.cluster import VmwareAttributesHandler
from nailgun.api.v1.handlers.disks import NodeDefaultsDisksHandler
from nailgun.api.v1.handlers.disks import NodeDisksHandler
from nailgun.api.v1.handlers.disks import NodeVolumesInformationHandler
# TODO(eli): should be moved into separate extension, as a part of blueprint:
# https://blueprints.launchpad.net/fuel/+spec/volume-manager-refactoring
from nailgun.extensions.volume_manager.handlers.disks \
import NodeDefaultsDisksHandler
from nailgun.extensions.volume_manager.handlers.disks \
import NodeDisksHandler
from nailgun.extensions.volume_manager.handlers.disks \
import NodeVolumesInformationHandler
from nailgun.api.v1.handlers.logs import LogEntryCollectionHandler
from nailgun.api.v1.handlers.logs import LogPackageDefaultConfig

View File

@ -54,8 +54,17 @@ class TestAPIDocGeneration(BaseIntegrationTest):
def test_url_generator(self):
path = os.path.dirname(os.path.realpath(__file__))
path = ('/'.join(path.split('/')[:-2])) + "/api/v1/handlers/"
classes = self.load_from_path(path)
handlers_path = ('/'.join(path.split('/')[:-2])) + "/api/v1/handlers/"
classes = self.load_from_path(handlers_path)
# TODO(eli): Remove this hack when urls definition will be moved
# into extensions directory, should be done as a part of blueprint
# https://blueprints.launchpad.net/fuel/+spec
# /volume-manager-refactoring
extensions_path = ('/'.join(path.split('/')[:-2])) + \
'/extensions/volume_manager/handlers/'
classes.extend(self.load_from_path(extensions_path))
names = set()
unique_classes = []
urls_ = []