From 3d26fc9a1c65b5d15442f2ac27b8b8c9a98b71de Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 17 Jun 2015 15:57:42 +0000 Subject: [PATCH] Drop use of 'oslo' namespace package The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: Ib9106f86b1a04825c24bb2be284c17590f941d3c --- octavia/amphorae/backends/agent/api_server/util.py | 2 +- octavia/api/v1/controllers/base.py | 2 +- octavia/api/v1/handlers/queue/producer.py | 4 ++-- octavia/common/base_taskflow.py | 2 +- octavia/controller/queue/consumer.py | 2 +- octavia/controller/queue/endpoint.py | 2 +- octavia/controller/worker/flows/amphora_flows.py | 2 +- octavia/controller/worker/flows/load_balancer_flows.py | 2 +- octavia/controller/worker/tasks/amphora_driver_tasks.py | 2 +- octavia/controller/worker/tasks/compute_tasks.py | 2 +- octavia/controller/worker/tasks/network_tasks.py | 2 +- octavia/i18n.py | 2 +- octavia/tests/unit/common/test_base_taskflow.py | 4 ++-- octavia/tests/unit/controller/queue/test_consumer.py | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/octavia/amphorae/backends/agent/api_server/util.py b/octavia/amphorae/backends/agent/api_server/util.py index 643fd71c23..80ad8a2e9d 100644 --- a/octavia/amphorae/backends/agent/api_server/util.py +++ b/octavia/amphorae/backends/agent/api_server/util.py @@ -15,7 +15,7 @@ import os -from oslo.config import cfg +from oslo_config import cfg CONF = cfg.CONF CONF.import_group('haproxy_amphora', 'octavia.common.config') diff --git a/octavia/api/v1/controllers/base.py b/octavia/api/v1/controllers/base.py index 35b40fc310..11e002d77a 100644 --- a/octavia/api/v1/controllers/base.py +++ b/octavia/api/v1/controllers/base.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.config import cfg +from oslo_config import cfg from pecan import rest from stevedore import driver as stevedore_driver diff --git a/octavia/api/v1/handlers/queue/producer.py b/octavia/api/v1/handlers/queue/producer.py index 3659f93935..f9280a1707 100644 --- a/octavia/api/v1/handlers/queue/producer.py +++ b/octavia/api/v1/handlers/queue/producer.py @@ -26,8 +26,8 @@ import abc -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging import six from octavia.api.v1.handlers import abstract_handler diff --git a/octavia/common/base_taskflow.py b/octavia/common/base_taskflow.py index 35ef974805..c2f575c165 100644 --- a/octavia/common/base_taskflow.py +++ b/octavia/common/base_taskflow.py @@ -14,7 +14,7 @@ # import concurrent.futures -from oslo.config import cfg +from oslo_config import cfg from taskflow import engines as tf_engines diff --git a/octavia/controller/queue/consumer.py b/octavia/controller/queue/consumer.py index 0532dc2c75..abd27d7205 100644 --- a/octavia/controller/queue/consumer.py +++ b/octavia/controller/queue/consumer.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging from oslo_config import cfg from oslo_log import log as logging +import oslo_messaging as messaging from octavia.controller.queue import endpoint from octavia.i18n import _LI diff --git a/octavia/controller/queue/endpoint.py b/octavia/controller/queue/endpoint.py index 0f0cb00052..3f68fcfb60 100644 --- a/octavia/controller/queue/endpoint.py +++ b/octavia/controller/queue/endpoint.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import messaging from oslo_log import log as logging +import oslo_messaging as messaging from octavia.common import constants from octavia.controller.worker import controller_worker diff --git a/octavia/controller/worker/flows/amphora_flows.py b/octavia/controller/worker/flows/amphora_flows.py index f2cbc774ba..ed4db91b2d 100644 --- a/octavia/controller/worker/flows/amphora_flows.py +++ b/octavia/controller/worker/flows/amphora_flows.py @@ -13,7 +13,7 @@ # under the License. # -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import linear_flow from taskflow import retry diff --git a/octavia/controller/worker/flows/load_balancer_flows.py b/octavia/controller/worker/flows/load_balancer_flows.py index 1dbe2dab1a..546fd310f6 100644 --- a/octavia/controller/worker/flows/load_balancer_flows.py +++ b/octavia/controller/worker/flows/load_balancer_flows.py @@ -13,7 +13,7 @@ # under the License. # -from oslo.config import cfg +from oslo_config import cfg from taskflow.patterns import linear_flow from octavia.common import constants diff --git a/octavia/controller/worker/tasks/amphora_driver_tasks.py b/octavia/controller/worker/tasks/amphora_driver_tasks.py index cf0a36848e..9d4925edc9 100644 --- a/octavia/controller/worker/tasks/amphora_driver_tasks.py +++ b/octavia/controller/worker/tasks/amphora_driver_tasks.py @@ -15,7 +15,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from stevedore import driver as stevedore_driver from taskflow import task from taskflow.types import failure diff --git a/octavia/controller/worker/tasks/compute_tasks.py b/octavia/controller/worker/tasks/compute_tasks.py index 5cc855252c..61629fe96d 100644 --- a/octavia/controller/worker/tasks/compute_tasks.py +++ b/octavia/controller/worker/tasks/compute_tasks.py @@ -16,7 +16,7 @@ import logging import time -from oslo.config import cfg +from oslo_config import cfg from stevedore import driver as stevedore_driver from taskflow import task from taskflow.types import failure diff --git a/octavia/controller/worker/tasks/network_tasks.py b/octavia/controller/worker/tasks/network_tasks.py index dfdbc68a43..18d5d4fe7f 100644 --- a/octavia/controller/worker/tasks/network_tasks.py +++ b/octavia/controller/worker/tasks/network_tasks.py @@ -15,7 +15,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from stevedore import driver as stevedore_driver from taskflow import task from taskflow.types import failure diff --git a/octavia/i18n.py b/octavia/i18n.py index 3d9b25f7e7..d9d9d0d654 100644 --- a/octavia/i18n.py +++ b/octavia/i18n.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo import i18n +import oslo_i18n as i18n _translators = i18n.TranslatorFactory(domain='octavia') diff --git a/octavia/tests/unit/common/test_base_taskflow.py b/octavia/tests/unit/common/test_base_taskflow.py index 0f2d8abdcd..e7ae4afe5f 100644 --- a/octavia/tests/unit/common/test_base_taskflow.py +++ b/octavia/tests/unit/common/test_base_taskflow.py @@ -15,8 +15,8 @@ import concurrent.futures import mock -from oslo.config import cfg -from oslo.config import fixture as oslo_fixture +from oslo_config import cfg +from oslo_config import fixture as oslo_fixture from taskflow import engines as tf_engines from octavia.common import base_taskflow diff --git a/octavia/tests/unit/controller/queue/test_consumer.py b/octavia/tests/unit/controller/queue/test_consumer.py index 20290f6a53..5692a96b3e 100644 --- a/octavia/tests/unit/controller/queue/test_consumer.py +++ b/octavia/tests/unit/controller/queue/test_consumer.py @@ -13,8 +13,8 @@ # under the License. import mock -from oslo.config import cfg -from oslo import messaging +from oslo_config import cfg +import oslo_messaging as messaging from octavia.controller.queue import consumer from octavia.controller.queue import endpoint