From 3869f75e697b591f2ca37a960e5d900e17dbdf98 Mon Sep 17 00:00:00 2001 From: Anastasia Karpinska Date: Mon, 13 Jan 2014 10:21:36 +0200 Subject: [PATCH] Rename __init__.py to create_volume.py This commit is the first step of creating packages structure for flows. This change is required to preserve git history of renamed files for change I63473f549f0c501fe0f373830bc1080239d01892 Change-Id: Ib5ed0e9196fa7bf4fd0b69a13c90e40c360ad8ef --- cinder/scheduler/manager.py | 2 +- cinder/tests/test_create_volume_flow.py | 2 +- cinder/tests/test_rbd.py | 2 +- cinder/volume/api.py | 2 +- cinder/volume/flows/api/__init__.py | 0 .../flows/{create_volume/__init__.py => api/create_volume.py} | 0 cinder/volume/manager.py | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 cinder/volume/flows/api/__init__.py rename cinder/volume/flows/{create_volume/__init__.py => api/create_volume.py} (100%) diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py index 205bee586..d6aa77e48 100644 --- a/cinder/scheduler/manager.py +++ b/cinder/scheduler/manager.py @@ -30,7 +30,7 @@ from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common.notifier import api as notifier from cinder import quota -from cinder.volume.flows import create_volume +from cinder.volume.flows.api import create_volume from cinder.volume import rpcapi as volume_rpcapi diff --git a/cinder/tests/test_create_volume_flow.py b/cinder/tests/test_create_volume_flow.py index 50cf7224c..3b5dc0215 100644 --- a/cinder/tests/test_create_volume_flow.py +++ b/cinder/tests/test_create_volume_flow.py @@ -18,7 +18,7 @@ import time from cinder import context from cinder import test -from cinder.volume.flows import create_volume +from cinder.volume.flows.api import create_volume class fake_scheduler_rpc_api(object): diff --git a/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py index efe8959ce..2edf62c1c 100644 --- a/cinder/tests/test_rbd.py +++ b/cinder/tests/test_rbd.py @@ -34,7 +34,7 @@ from cinder.tests.test_volume import DriverTestCase from cinder import units from cinder.volume import configuration as conf import cinder.volume.drivers.rbd as driver -from cinder.volume.flows import create_volume +from cinder.volume.flows.api import create_volume LOG = logging.getLogger(__name__) diff --git a/cinder/volume/api.py b/cinder/volume/api.py index 72e10fd7f..5991d571b 100644 --- a/cinder/volume/api.py +++ b/cinder/volume/api.py @@ -38,7 +38,7 @@ from cinder import quota from cinder import quota_utils from cinder.scheduler import rpcapi as scheduler_rpcapi from cinder import utils -from cinder.volume.flows import create_volume +from cinder.volume.flows.api import create_volume from cinder.volume import qos_specs from cinder.volume import rpcapi as volume_rpcapi from cinder.volume import utils as volume_utils diff --git a/cinder/volume/flows/api/__init__.py b/cinder/volume/flows/api/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/cinder/volume/flows/create_volume/__init__.py b/cinder/volume/flows/api/create_volume.py similarity index 100% rename from cinder/volume/flows/create_volume/__init__.py rename to cinder/volume/flows/api/create_volume.py diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 1da9d01f0..c074b41e0 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -54,7 +54,7 @@ from cinder.openstack.common import uuidutils from cinder import quota from cinder import utils from cinder.volume.configuration import Configuration -from cinder.volume.flows import create_volume +from cinder.volume.flows.api import create_volume from cinder.volume import rpcapi as volume_rpcapi from cinder.volume import utils as volume_utils from cinder.volume import volume_types -- 2.45.2