From 07b0246735441abd480744d21cb1dba7c42df495 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Sun, 11 Feb 2018 21:58:04 +0000 Subject: [PATCH] Use nova.db.api directly 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 --- nova/db/__init__.py | 11 ++--------- nova/db/base.py | 4 ++-- nova/test.py | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/nova/db/__init__.py b/nova/db/__init__.py index 63b3b6fb0..8c26ee86a 100644 --- a/nova/db/__init__.py +++ b/nova/db/__init__.py @@ -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.""" diff --git a/nova/db/base.py b/nova/db/base.py index c52ad385f..7285b6164 100644 --- a/nova/db/base.py +++ b/nova/db/base.py @@ -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 diff --git a/nova/test.py b/nova/test.py index 63889d9b4..bff54624f 100644 --- a/nova/test.py +++ b/nova/test.py @@ -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