Change oslo package names according to the latest oslo release 2.0.0

Also requirements have modified to reflect the latest oslo packages.

Change-Id: I5f5e28ef183dfbafc8c1215ef92d55f6358de27d

poppy/bootstrap.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from stevedore import driver
 from stevedore import named
 

poppy/cmd/server.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy import bootstrap
 from poppy.common import cli

poppy/cmd/task_flow_worker.py

@@ -16,7 +16,7 @@
 import os
 import socket
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy import bootstrap
 from poppy.openstack.common import log

poppy/distributed_task/base/driver.py

@@ -23,7 +23,7 @@ class DistributedTaskDriverBase(object):
     """Interface definition for distributed task queue driver.
 
     :param conf: Configuration containing options for this driver.
-    :type conf: `oslo.config.ConfigOpts`
+    :type conf: `oslo_config.ConfigOpts`
     """
     def __init__(self, conf):
         self._conf = conf

poppy/distributed_task/taskflow/driver.py

@@ -15,7 +15,7 @@
 
 import logging
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow.jobs import backends as job_backends
 from taskflow.persistence import backends as persistence_backends
 

poppy/distributed_task/taskflow/flow/create_service.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow.patterns import graph_flow
 from taskflow.patterns import linear_flow
 from taskflow import retry

poppy/distributed_task/taskflow/flow/delete_service.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow.patterns import graph_flow
 from taskflow.patterns import linear_flow
 from taskflow import retry

poppy/distributed_task/taskflow/flow/purge_service.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow.patterns import graph_flow
 from taskflow.patterns import linear_flow
 

poppy/distributed_task/taskflow/flow/update_service.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow.patterns import graph_flow
 from taskflow.patterns import linear_flow
 from taskflow import retry

poppy/distributed_task/taskflow/flow/update_service_state.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow.patterns import linear_flow
 
 from poppy.distributed_task.taskflow.task import update_service_state_tasks

poppy/distributed_task/taskflow/services.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 from taskflow.conductors import single_threaded
 from taskflow import engines
 from taskflow.listeners import logging as logging_listener

poppy/distributed_task/taskflow/task/common.py

@@ -16,7 +16,7 @@
 import json
 import requests
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow import task
 
 from poppy.distributed_task.utils import memoized_controllers

poppy/distributed_task/taskflow/task/create_service_tasks.py

@@ -16,7 +16,7 @@
 import json
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow import task
 
 from poppy.distributed_task.taskflow.task import common

poppy/distributed_task/taskflow/task/delete_service_tasks.py

@@ -16,7 +16,7 @@
 import json
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow import task
 
 from poppy.distributed_task.utils import exc_loader

poppy/distributed_task/taskflow/task/purge_service_tasks.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow import task
 
 from poppy.distributed_task.utils import memoized_controllers

poppy/distributed_task/taskflow/task/update_service_state_tasks.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow import task
 
 from poppy.distributed_task.utils import memoized_controllers

poppy/distributed_task/taskflow/task/update_service_tasks.py

@@ -16,7 +16,7 @@
 import json
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from taskflow import task
 
 from poppy.distributed_task.taskflow.task import common

poppy/distributed_task/utils/memoized_controllers.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy import bootstrap
 from poppy.openstack.common import log

poppy/dns/base/driver.py

@@ -31,7 +31,7 @@ class DNSDriverBase(object):
     CDN provider url.
 
     :param conf: Configuration containing options for this driver.
-    :type conf: `oslo.config.ConfigOpts`
+    :type conf: `oslo_config.ConfigOpts`
     """
 
     def __init__(self, conf):

poppy/dns/rackspace/driver.py

@@ -15,7 +15,7 @@
 
 """DNS Provider implementation."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pyrax
 
 from poppy.dns import base

poppy/manager/default/services.py

@@ -17,7 +17,7 @@ import json
 import random
 
 import jsonpatch
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.common import errors
 from poppy.distributed_task.taskflow.flow import create_service

poppy/openstack/common/log.py

@@ -36,7 +36,7 @@ import os
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from six import moves
 
@@ -124,7 +124,7 @@ generic_log_opts = [
 
 DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN',
                       'qpid=WARN', 'sqlalchemy=WARN', 'suds=INFO',
-                      'oslo.messaging=INFO', 'iso8601=WARN',
+                      'oslo_messaging=INFO', 'iso8601=WARN',
                       'requests.packages.urllib3.connectionpool=WARN',
                       'urllib3.connectionpool=WARN', 'websocket=WARN']
 

poppy/provider/akamai/driver.py

@@ -18,7 +18,7 @@
 import json
 
 from akamai import edgegrid
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from poppy.openstack.common import log

poppy/provider/base/driver.py

@@ -29,7 +29,7 @@ class ProviderDriverBase(object):
     loaded from the config file.
 
     :param conf: Configuration containing options for this driver.
-    :type conf: `oslo.config.ConfigOpts`
+    :type conf: `oslo_config.ConfigOpts`
     """
 
     def __init__(self, conf):

poppy/provider/cloudfront/driver.py

@@ -16,7 +16,7 @@
 """CloudFront CDN Provider implementation."""
 
 import boto
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from poppy.openstack.common import log as logging

poppy/provider/fastly/driver.py

@@ -16,7 +16,7 @@
 """Fastly CDN Provider implementation."""
 
 import fastly
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from poppy.openstack.common import log as logging

poppy/provider/maxcdn/driver.py

@@ -16,7 +16,7 @@
 """Max CDN Provider implementation."""
 
 import maxcdn
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from poppy.openstack.common import log as logging

poppy/storage/base/driver.py

@@ -15,7 +15,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 
@@ -38,7 +38,7 @@ class StorageDriverBase(object):
     loaded from the config file.
 
     :param conf: Configuration containing options for this driver.
-    :type conf: `oslo.config.ConfigOpts`
+    :type conf: `oslo_config.ConfigOpts`
     """
 
     def __init__(self, conf):

poppy/storage/cassandra/driver.py

@@ -26,7 +26,7 @@ from cassandra import cluster
 from cassandra import policies
 from cassandra import query
 from cdeploy import migrator
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.openstack.common import log as logging
 from poppy.storage import base

poppy/storage/mockdb/driver.py

@@ -19,7 +19,7 @@ from poppy.openstack.common import log as logging
 from poppy.storage import base
 from poppy.storage.mockdb import controllers
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 LOG = logging.getLogger(__name__)
 

poppy/transport/app.py

@@ -26,7 +26,7 @@ no common way to specify / pass configuration files
 to the WSGI app when it is called from other apps.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy import bootstrap
 

poppy/transport/base.py

@@ -23,7 +23,7 @@ class TransportDriverBase(object):
     """Base class for Transport Drivers to document the expected interface.
 
     :param conf: configuration instance
-    :type conf: oslo.config.cfg.CONF
+    :type conf: oslo_config.cfg.CONF
     """
 
     def __init__(self, conf, manager):

poppy/transport/pecan/controllers/v1/services.py

@@ -16,7 +16,7 @@
 import json
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 from pecan import hooks
 

poppy/transport/pecan/driver.py

@@ -15,7 +15,7 @@
 
 from wsgiref import simple_server
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 
 from poppy.openstack.common import log

poppy/transport/pecan/hooks/context.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 from pecan import hooks
 

requirements/common.txt

@@ -12,4 +12,6 @@ python-keystoneclient>=0.4.1
 WebOb>=1.2.3,<1.3
 stevedore>=0.10
 six>=1.4.1
-oslo.config>=1.2.0
+oslo.config>=2.0.0
+oslo.serialization>=1.7.0
+oslo.utils>=2.0.0

requirements/docs.txt

@@ -1,4 +1,5 @@
 oslosphinx
 sphinx
 sphinxcontrib-pecanwsme
-sphinxcontrib-httpdomain
+sphinxcontrib-httpdomain
+oslo.i18n>=2.1.0

tests/base.py

@@ -16,7 +16,7 @@
 import os
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 
 

tests/functional/transport/pecan/base.py

@@ -16,7 +16,7 @@
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import webtest
 
 from poppy import bootstrap

tests/functional/transport/pecan/controllers/test_services.py

@@ -21,7 +21,7 @@ except ImportError:
 import uuid
 
 import ddt
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 
 from poppy.transport.pecan.controllers import base as c_base

tests/test-requirements.txt

@@ -6,7 +6,7 @@ hacking
 mock
 nose
 openstack.nose_plugin
-oslotest
+oslotest>=1.9.0
 requests
 testrepository
 testtools

tests/unit/distributed_task/taskflow/test_driver.py

@@ -15,7 +15,7 @@
 
 """Unittests for TaskFlow distributed_task driver implementation."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.distributed_task.taskflow import driver
 from tests.unit import base

tests/unit/distributed_task/taskflow/test_services.py

@@ -16,7 +16,7 @@
 """Unittests for TaskFlow distributed_task service_controller."""
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.distributed_task.taskflow import driver
 from tests.unit import base

tests/unit/dns/rackspace/test_driver.py

@@ -16,7 +16,7 @@
 """Unittests for Rackspace DNS Provider implementation."""
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import pyrax
 
 from poppy.dns.rackspace import driver

tests/unit/dns/rackspace/test_services.py

@@ -17,7 +17,7 @@ import uuid
 
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import pyrax.exceptions as exc
 
 from poppy.dns.rackspace import driver

tests/unit/manager/default/test_driver.py

@@ -15,7 +15,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy import bootstrap
 from poppy.manager.default import flavors

tests/unit/manager/default/test_flavors.py

@@ -17,7 +17,7 @@ import os
 import uuid
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.manager.default import driver
 from poppy.manager.default import flavors

tests/unit/manager/default/test_services.py

@@ -19,7 +19,7 @@ import uuid
 
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 
 from poppy.distributed_task.taskflow.task import common

tests/unit/provider/akamai/test_driver.py

@@ -17,7 +17,7 @@ import random
 
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.provider.akamai import driver
 from tests.unit import base

tests/unit/provider/cloudfront/test_driver.py

@@ -16,7 +16,7 @@
 
 import boto
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.common import util
 from poppy.provider.cloudfront import driver

tests/unit/provider/fastly/test_driver.py

@@ -15,7 +15,7 @@
 
 import fastly
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.common import util
 from poppy.provider.fastly import driver

tests/unit/provider/maxcdn/test_driver.py

@@ -16,7 +16,7 @@
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.common import util
 from poppy.provider.maxcdn import driver

tests/unit/provider/maxcdn/test_services.py

@@ -18,7 +18,7 @@ import uuid
 
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.provider.maxcdn import driver
 from poppy.provider.maxcdn import services

tests/unit/provider/mock/test_mock_driver.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.provider.mock import driver
 from tests.unit import base

tests/unit/storage/cassandra/test_driver.py

@@ -17,7 +17,7 @@ import ssl
 
 import cassandra
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.storage.cassandra import driver
 from poppy.storage.cassandra import flavors

tests/unit/storage/cassandra/test_flavors.py

@@ -18,7 +18,7 @@ import uuid
 import cassandra
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.model import flavor as model_flavor
 from poppy.storage.cassandra import driver

tests/unit/storage/cassandra/test_services.py

@@ -23,7 +23,7 @@ except ImportError:        # pragma: no cover
 import cassandra
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.model.helpers import provider_details
 from poppy.storage.cassandra import driver

tests/unit/storage/mockdb/test_driver.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.storage.mockdb import driver
 from tests.unit import base

tests/unit/storage/mockdb/test_flavors.py

@@ -17,7 +17,7 @@ import uuid
 
 import ddt
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.storage.mockdb import driver
 from poppy.storage.mockdb import flavors

tests/unit/storage/mockdb/test_services.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy.storage.mockdb import driver
 from poppy.storage.mockdb import services

tests/unit/test_bootstrap.py

@@ -16,7 +16,7 @@
 import os
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from poppy import bootstrap
 from tests.unit import base

tests/unit/transport/pecan/test_driver.py

@@ -16,7 +16,7 @@
 # import os
 
 # import mock
-# from oslo.config import cfg
+# from oslo_config import cfg
 
 # from poppy.transport import pecan
 # from tests.unit import base