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

diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py
index 205bee5869c7a8ec49262dffff10ebd04435b061..d6aa77e48ea64e50ede05874e454bc3c5a98e901 100644 (file)
--- 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 50cf7224c8b4530ef5a21a0407a2962d90d9e6de..3b5dc0215a9c65a6c3e9b60b540a10045a031383 100644 (file)
--- 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 efe8959ce28971c1ad71e0bcd6a7ed2357d97337..2edf62c1cd77bba90bb7ac7a3a06bb83fcaf3312 100644 (file)
--- 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 72e10fd7f929af6b20f2a1be695de85d24accaee..5991d571bfbd49f1f6da60a047ca6053b8796ccf 100644 (file)
--- 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 (file)
index 0000000..e69de29

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 1da9d01f0fb2a430b83c30582d76958520c27c9b..c074b41e0cbe41a79f1a5db3ba00b5d0b7d0dd69 100644 (file)
--- 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