Replace the nova import paths with placement

This commit is the result of running the following search and replace
across the project.
    s/from nova import /from placement import /g

Change-Id: I768c2a2290d9952375d6b5101313cb54ee067a56
This commit is contained in:
EdLeafe 2018-08-30 23:09:25 +00:00 committed by Eric Fried
parent 1dca56f58e
commit 467c253349
20 changed files with 34 additions and 34 deletions

View File

@ -60,15 +60,15 @@ from sqlalchemy.sql import func
from sqlalchemy.sql import null
from sqlalchemy.sql import true
from nova import block_device
from placement import block_device
from nova.compute import task_states
from nova.compute import vm_states
import nova.conf
import nova.context
from nova.db.sqlalchemy import models
from nova import exception
from placement import exception
from nova.i18n import _
from nova import safe_utils
from placement import safe_utils
profiler_sqlalchemy = importutils.try_import('osprofiler.sqlalchemy')
@ -4431,7 +4431,7 @@ def migration_get_by_sort_filters(context, sort_keys, sort_dirs, values):
@pick_context_manager_writer
def migration_migrate_to_uuid(context, count):
# Avoid circular import
from nova import objects
from placement import objects
db_migrations = model_query(context, models.Migration).filter_by(
uuid=None).limit(count).all()

View File

@ -13,9 +13,9 @@
from oslo_log import log as logging
from sqlalchemy import MetaData, Table, func, select
from nova import exception
from placement import exception
from nova.i18n import _
from nova import objects
from placement import objects
LOG = logging.getLogger(__name__)

View File

@ -26,7 +26,7 @@ from sqlalchemy.sql import null
from placement import db_api as placement_db
from nova.db.sqlalchemy import api as db_session
from nova import exception
from placement import exception
from nova.i18n import _
INIT_VERSION = {}

View File

@ -20,7 +20,7 @@ from oslo_utils import netutils
from sqlalchemy.dialects import postgresql
from sqlalchemy import types
from nova import utils
from placement import utils
class IPAddress(types.TypeDecorator):

View File

@ -22,7 +22,7 @@ from sqlalchemy import Table
from sqlalchemy.types import NullType
from nova.db.sqlalchemy import api as db
from nova import exception
from placement import exception
from nova.i18n import _

View File

@ -45,7 +45,7 @@ from placement.objects import user as user_obj
from placement import resource_class_cache as rc_cache
from nova.db.sqlalchemy import api_models as models
from nova.i18n import _
from nova import rc_fields
from placement import rc_fields
_TRAIT_TBL = models.Trait.__table__
_ALLOC_TBL = models.Allocation.__table__

View File

@ -16,7 +16,7 @@ import sqlalchemy as sa
from placement import db_api
from placement import exception
from nova.db.sqlalchemy import api_models as models
from nova import rc_fields as fields
from placement import rc_fields as fields
_RC_TBL = models.ResourceClass.__table__
_LOCKNAME = 'rc_cache'

View File

@ -50,18 +50,18 @@ import six
import testtools
from placement.objects import resource_provider
from nova import context
from placement import context
from nova.db import api as db
from nova import exception
from placement import exception
from nova.network import manager as network_manager
from nova.network.security_group import openstack_driver
from nova import objects
from placement import objects
from nova.objects import base as objects_base
from nova.tests import fixtures as nova_fixtures
from nova.tests.unit import conf_fixture
from nova.tests.unit import policy_fixture
from nova.tests import uuidsentinel as uuids
from nova import utils
from placement import utils
from nova.virt import images

View File

@ -44,17 +44,17 @@ from placement import db_api as placement_db
from import wsgi_app
from nova.api import wsgi
from nova.compute import rpcapi as compute_rpcapi
from nova import context
from placement import context
from nova.db import migration
from nova.db.sqlalchemy import api as session
from nova import exception
from placement import exception
from nova.network import model as network_model
from nova import objects
from placement import objects
from nova.objects import base as obj_base
from nova.objects import service as service_obj
from nova import quota as nova_quota
from nova import rpc
from nova import service
from placement import quota as nova_quota
from placement import rpc
from placement import service
from nova.tests.functional.api import client
from nova.tests.functional.fixtures import placement
from nova.tests import uuidsentinel

View File

@ -17,7 +17,7 @@ import sqlalchemy as sa
from placement import exception
from placement import lib as placement_lib
from placement.objects import resource_provider as rp_obj
from nova import rc_fields as fields
from placement import rc_fields as fields
from nova.tests.functional.db import test_base as tb
from nova.tests import uuidsentinel as uuids

View File

@ -19,7 +19,7 @@ from placement.objects import consumer as consumer_obj
from placement.objects import project as project_obj
from placement.objects import resource_provider as rp_obj
from placement.objects import user as user_obj
from nova import rc_fields as fields
from placement import rc_fields as fields
from nova.tests.functional.api.openstack.placement import base
from nova.tests.functional.db import test_base as tb
from nova.tests import uuidsentinel as uuids

View File

@ -17,7 +17,7 @@ from oslo_utils import timeutils
from placement import exception
from placement import resource_class_cache as rc_cache
from nova import rc_fields as fields
from placement import rc_fields as fields
from nova.tests.functional.api.openstack.placement import base

View File

@ -22,7 +22,7 @@ from placement import exception
from placement.objects import consumer as consumer_obj
from placement.objects import resource_provider as rp_obj
from nova.db.sqlalchemy import api_models as models
from nova import rc_fields as fields
from placement import rc_fields as fields
from nova.tests.functional.db import test_base as tb
from nova.tests import uuidsentinel

View File

@ -26,7 +26,7 @@ from placement.objects import project as project_obj
from placement.objects import resource_provider as rp_obj
from placement.objects import user as user_obj
from placement import policies
from nova import rc_fields as fields
from placement import rc_fields as fields
from nova.tests import fixtures
from nova.tests.functional.db import test_base as tb
from nova.tests.functional.fixtures import capture

View File

@ -22,7 +22,7 @@
:platform: Unix
"""
from nova import objects
from placement import objects
# NOTE(comstud): Make sure we have all of the objects loaded. We do this
# at module import time, because we may be using mock decorators in our

View File

@ -18,7 +18,7 @@ import testtools
from placement import context
from placement import exception
from placement.objects import resource_provider
from nova import rc_fields as fields
from placement import rc_fields as fields
from nova.tests import uuidsentinel as uuids

View File

@ -21,7 +21,7 @@ from oslo_serialization import jsonutils
from placement import policy as placement_policy
import nova.conf
from nova.conf import paths
from nova import policies
from placement import policies
import nova.policy
from nova.tests.unit import fake_policy

View File

@ -20,7 +20,7 @@ from placement import exception
from placement import policy
from nova.tests.unit import conf_fixture
from nova.tests.unit import policy_fixture
from nova import utils
from placement import utils
class PlacementPolicyTestCase(testtools.TestCase):

View File

@ -51,11 +51,11 @@ from six.moves import range
from six.moves import reload_module
import nova.conf
from nova import debugger
from nova import exception
from placement import debugger
from placement import exception
from nova.i18n import _, _LE, _LI, _LW
import nova.network
from nova import safe_utils
from placement import safe_utils
profiler = importutils.try_import('osprofiler.profiler')

View File

@ -26,7 +26,7 @@ import pbr.version
from placement import db_api
from placement import deploy
from nova import conf
from placement import conf
profiler = importutils.try_import('osprofiler.opts')