diff options
| -rw-r--r-- | nova/api/rackspace/__init__.py | 8 | ||||
| -rw-r--r-- | nova/api/rackspace/base.py (renamed from nova/api/rackspace/controllers/base.py) | 0 | ||||
| -rw-r--r-- | nova/api/rackspace/controllers/__init__.py | 0 | ||||
| -rw-r--r-- | nova/api/rackspace/flavors.py (renamed from nova/api/rackspace/controllers/flavors.py) | 0 | ||||
| -rw-r--r-- | nova/api/rackspace/images.py (renamed from nova/api/rackspace/controllers/images.py) | 0 | ||||
| -rw-r--r-- | nova/api/rackspace/servers.py (renamed from nova/api/rackspace/controllers/servers.py) | 2 | ||||
| -rw-r--r-- | nova/api/rackspace/sharedipgroups.py (renamed from nova/api/rackspace/controllers/sharedipgroups.py) | 0 |
7 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/rackspace/__init__.py b/nova/api/rackspace/__init__.py index 662cbe495..27e78f801 100644 --- a/nova/api/rackspace/__init__.py +++ b/nova/api/rackspace/__init__.py @@ -29,10 +29,10 @@ import webob.exc from nova import flags from nova import wsgi -from nova.api.rackspace.controllers import flavors -from nova.api.rackspace.controllers import images -from nova.api.rackspace.controllers import servers -from nova.api.rackspace.controllers import sharedipgroups +from nova.api.rackspace import flavors +from nova.api.rackspace import images +from nova.api.rackspace import servers +from nova.api.rackspace import sharedipgroups from nova.auth import manager diff --git a/nova/api/rackspace/controllers/base.py b/nova/api/rackspace/base.py index dd2c6543c..dd2c6543c 100644 --- a/nova/api/rackspace/controllers/base.py +++ b/nova/api/rackspace/base.py diff --git a/nova/api/rackspace/controllers/__init__.py b/nova/api/rackspace/controllers/__init__.py deleted file mode 100644 index e69de29bb..000000000 --- a/nova/api/rackspace/controllers/__init__.py +++ /dev/null diff --git a/nova/api/rackspace/controllers/flavors.py b/nova/api/rackspace/flavors.py index 986f11434..986f11434 100644 --- a/nova/api/rackspace/controllers/flavors.py +++ b/nova/api/rackspace/flavors.py diff --git a/nova/api/rackspace/controllers/images.py b/nova/api/rackspace/images.py index 986f11434..986f11434 100644 --- a/nova/api/rackspace/controllers/images.py +++ b/nova/api/rackspace/images.py diff --git a/nova/api/rackspace/controllers/servers.py b/nova/api/rackspace/servers.py index 1d0221ea8..25d1fe9c8 100644 --- a/nova/api/rackspace/controllers/servers.py +++ b/nova/api/rackspace/servers.py @@ -17,7 +17,7 @@ from nova import rpc from nova.compute import model as compute -from nova.api.rackspace.controllers import base +from nova.api.rackspace import base class Controller(base.Controller): diff --git a/nova/api/rackspace/controllers/sharedipgroups.py b/nova/api/rackspace/sharedipgroups.py index 986f11434..986f11434 100644 --- a/nova/api/rackspace/controllers/sharedipgroups.py +++ b/nova/api/rackspace/sharedipgroups.py |