openstack/placement
Code Issues Proposed changes

Use nova.db.api directly

Browse Source 
nova/db/__init__.py was importing * from nova.db.api. This meant that
any time any code anywhere within the nova.db package was imported
then nova.db.api was too, leading to a cascade of imports that may
not have been desired. Also, in general, code in __init__.py is a pain.

Therefore, this change adjusts code that so that either:

* nova.db.api is used directly
* nova.db.api is imported as 'db'

In either case, the functionality remains the same.

The primary goal of this change was to make it possible to import the
model files without having to import the db api. Moving the model files
to a different place in the directory hierarchy was considered, but
given that "code in __init__.py is a pain" this mode was chosen.

This looks like a very large change, but it is essentially adjusting
package names, many in mocks.

Change-Id: Ic1fd7c87ceda05eeb96735da2a415ef37060bb1a
This commit is contained in:
Chris Dent
2018-02-11 21:58:04 +00:00
committed by Eric Fried
parent e2b7211776
commit 07b0246735
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/db/__init__.py
View File

@@ -1,7 +1,3 @@
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# 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
@@ -13,8 +9,5 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""
DB abstraction for Nova
"""
from nova.db.api import * # noqa
"""Use nova.db.api instead. In the past this file imported * from there,
which led to unwanted imports."""

4
nova/db/base.py
View File

@@ -16,7 +16,7 @@
"""Base class for classes that need database access."""
import nova.db
import nova.db.api
class Base(object):
@@ -24,4 +24,4 @@ class Base(object):
def __init__(self):
super(Base, self).__init__()
self.db = nova.db
self.db = nova.db.api

2
nova/test.py
View File

@@ -52,7 +52,7 @@ import testtools
from nova.api.openstack.placement.objects import resource_provider
from nova import context
from nova import db
from nova.db import api as db
from nova import exception
from nova.network import manager as network_manager
from nova.network.security_group import openstack_driver