renamed import statements from cdn. to poppy.
This commit is contained in:
parent
5435a5cc16
commit
51433db5e0
@ -13,8 +13,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.common import decorators
|
||||
from cdn.openstack.common import log
|
||||
from poppy.common import decorators
|
||||
from poppy.openstack.common import log
|
||||
from oslo.config import cfg
|
||||
from stevedore import driver, extension
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
from cdn import bootstrap
|
||||
from cdn.common import cli
|
||||
from poppy.common import cli
|
||||
from oslo.config import cfg
|
||||
|
||||
|
||||
|
@ -20,8 +20,8 @@ import os
|
||||
import sys
|
||||
import termios
|
||||
|
||||
from cdn.openstack.common.gettextutils import _
|
||||
from cdn.openstack.common import log as logging
|
||||
from poppy.openstack.common.gettextutils import _
|
||||
from poppy.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -13,9 +13,9 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.manager.base import driver
|
||||
from cdn.manager.base import services
|
||||
from cdn.manager.base import v1
|
||||
from poppy.manager.base import driver
|
||||
from poppy.manager.base import services
|
||||
from poppy.manager.base import v1
|
||||
|
||||
|
||||
Driver = driver.ManagerDriverBase
|
||||
|
@ -16,8 +16,8 @@
|
||||
import abc
|
||||
import six
|
||||
|
||||
from cdn.manager.base import controller
|
||||
from cdn.manager.base import providers
|
||||
from poppy.manager.base import controller
|
||||
from poppy.manager.base import providers
|
||||
|
||||
|
||||
@six.add_metaclass(abc.ABCMeta)
|
||||
|
@ -16,7 +16,7 @@
|
||||
import abc
|
||||
import six
|
||||
|
||||
from cdn.manager.base import controller
|
||||
from poppy.manager.base import controller
|
||||
|
||||
|
||||
@six.add_metaclass(abc.ABCMeta)
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
"""Default Manager Driver"""
|
||||
|
||||
from cdn.manager.default import driver
|
||||
from poppy.manager.default import driver
|
||||
|
||||
|
||||
# Hoist classes into package namespace
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.manager.default import services, v1
|
||||
from poppy.manager.default import services, v1
|
||||
|
||||
|
||||
Services = services.DefaultServicesController
|
||||
|
@ -15,9 +15,9 @@
|
||||
|
||||
"""Default manager driver implementation."""
|
||||
|
||||
from cdn.common import decorators
|
||||
from cdn.manager import base
|
||||
from cdn.manager.default import controllers
|
||||
from poppy.common import decorators
|
||||
from poppy.manager import base
|
||||
from poppy.manager.default import controllers
|
||||
|
||||
|
||||
class DefaultManagerDriver(base.Driver):
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.manager import base
|
||||
from poppy.manager import base
|
||||
|
||||
|
||||
class DefaultServicesController(base.ServicesController):
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.manager import base
|
||||
from poppy.manager import base
|
||||
|
||||
JSON_HOME = {
|
||||
"resources": {
|
||||
|
@ -19,7 +19,7 @@ gettext for openstack-common modules.
|
||||
|
||||
Usual usage in an openstack.common module:
|
||||
|
||||
from cdn.openstack.common.gettextutils import _
|
||||
from poppy.openstack.common.gettextutils import _
|
||||
"""
|
||||
|
||||
import copy
|
||||
|
@ -51,10 +51,10 @@ else:
|
||||
import six
|
||||
import six.moves.xmlrpc_client as xmlrpclib
|
||||
|
||||
from cdn.openstack.common import gettextutils
|
||||
from cdn.openstack.common import importutils
|
||||
from cdn.openstack.common import strutils
|
||||
from cdn.openstack.common import timeutils
|
||||
from poppy.openstack.common import gettextutils
|
||||
from poppy.openstack.common import importutils
|
||||
from poppy.openstack.common import strutils
|
||||
from poppy.openstack.common import timeutils
|
||||
|
||||
netaddr = importutils.try_import("netaddr")
|
||||
|
||||
|
@ -40,13 +40,13 @@ from oslo.config import cfg
|
||||
import six
|
||||
from six import moves
|
||||
|
||||
from cdn.openstack.common.gettextutils import _
|
||||
from cdn.openstack.common import importutils
|
||||
from cdn.openstack.common import jsonutils
|
||||
from cdn.openstack.common import local
|
||||
from poppy.openstack.common.gettextutils import _
|
||||
from poppy.openstack.common import importutils
|
||||
from poppy.openstack.common import jsonutils
|
||||
from poppy.openstack.common import local
|
||||
# NOTE(flaper87): Pls, remove when graduating this module
|
||||
# from the incubator.
|
||||
from cdn.openstack.common.strutils import mask_password # noqa
|
||||
from poppy.openstack.common.strutils import mask_password # noqa
|
||||
|
||||
|
||||
_DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
|
||||
|
@ -24,7 +24,7 @@ import unicodedata
|
||||
|
||||
import six
|
||||
|
||||
from cdn.openstack.common.gettextutils import _
|
||||
from poppy.openstack.common.gettextutils import _
|
||||
|
||||
|
||||
UNIT_PREFIX_EXPONENT = {
|
||||
|
@ -13,8 +13,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.provider.base import driver
|
||||
from cdn.provider.base import services
|
||||
from poppy.provider.base import driver
|
||||
from poppy.provider.base import services
|
||||
|
||||
|
||||
Driver = driver.ProviderDriverBase
|
||||
|
@ -16,8 +16,8 @@
|
||||
import abc
|
||||
import six
|
||||
|
||||
from cdn.provider.base import controller
|
||||
from cdn.provider.base import responder
|
||||
from poppy.provider.base import controller
|
||||
from poppy.provider.base import responder
|
||||
|
||||
|
||||
@six.add_metaclass(abc.ABCMeta)
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""Fastly CDN Extension for CDN"""
|
||||
|
||||
from cdn.provider.fastly import driver
|
||||
from poppy.provider.fastly import driver
|
||||
|
||||
# Hoist classes into package namespace
|
||||
Driver = driver.CDNProvider
|
||||
|
@ -22,6 +22,6 @@ Field Mappings:
|
||||
updated and documented in each controller class.
|
||||
"""
|
||||
|
||||
from cdn.provider.fastly import services
|
||||
from poppy.provider.fastly import services
|
||||
|
||||
ServiceController = services.ServiceController
|
||||
|
@ -15,9 +15,9 @@
|
||||
|
||||
"""Fastly CDN Provider implementation."""
|
||||
|
||||
from cdn.openstack.common import log as logging
|
||||
from cdn.provider import base
|
||||
from cdn.provider.fastly import controllers
|
||||
from poppy.openstack.common import log as logging
|
||||
from poppy.provider import base
|
||||
from poppy.provider.fastly import controllers
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
import fastly
|
||||
|
||||
from cdn.provider import base
|
||||
from poppy.provider import base
|
||||
|
||||
|
||||
class ServiceController(base.ServiceBase):
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""CDN Extension for CDN"""
|
||||
|
||||
from cdn.provider.mock import driver
|
||||
from poppy.provider.mock import driver
|
||||
|
||||
# Hoist classes into package namespace
|
||||
Driver = driver.CDNProvider
|
||||
|
@ -22,6 +22,6 @@ Field Mappings:
|
||||
updated and documented in each controller class.
|
||||
"""
|
||||
|
||||
from cdn.provider.mock import services
|
||||
from poppy.provider.mock import services
|
||||
|
||||
ServiceController = services.ServiceController
|
||||
|
@ -15,9 +15,9 @@
|
||||
|
||||
"""CDN Provider implementation."""
|
||||
|
||||
from cdn.openstack.common import log as logging
|
||||
from cdn.provider import base
|
||||
from cdn.provider.mock import controllers
|
||||
from poppy.openstack.common import log as logging
|
||||
from poppy.provider import base
|
||||
from poppy.provider.mock import controllers
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.provider import base
|
||||
from poppy.provider import base
|
||||
|
||||
|
||||
class ServiceController(base.ServiceBase):
|
||||
|
@ -13,8 +13,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.storage.base import driver
|
||||
from cdn.storage.base import services
|
||||
from poppy.storage.base import driver
|
||||
from poppy.storage.base import services
|
||||
|
||||
|
||||
Driver = driver.StorageDriverBase
|
||||
|
@ -16,7 +16,7 @@
|
||||
import abc
|
||||
import six
|
||||
|
||||
from cdn.storage.base import controller
|
||||
from poppy.storage.base import controller
|
||||
|
||||
|
||||
@six.add_metaclass(abc.ABCMeta)
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""MongoDB Storage Driver for CDN"""
|
||||
|
||||
from cdn.storage.cassandra import driver
|
||||
from poppy.storage.cassandra import driver
|
||||
|
||||
# Hoist classes into package namespace
|
||||
Driver = driver.CassandraStorageDriver
|
||||
|
@ -23,6 +23,6 @@ Field Mappings:
|
||||
updated and documented in each controller class.
|
||||
"""
|
||||
|
||||
from cdn.storage.cassandra import services
|
||||
from poppy.storage.cassandra import services
|
||||
|
||||
ServicesController = services.ServicesController
|
||||
|
@ -17,10 +17,10 @@
|
||||
|
||||
from cassandra.cluster import Cluster
|
||||
|
||||
from cdn.common import decorators
|
||||
from cdn.openstack.common import log as logging
|
||||
from cdn.storage import base
|
||||
from cdn.storage.cassandra import controllers
|
||||
from poppy.common import decorators
|
||||
from poppy.openstack.common import log as logging
|
||||
from poppy.storage import base
|
||||
from poppy.storage.cassandra import controllers
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
import json
|
||||
|
||||
from cdn.storage import base
|
||||
from poppy.storage import base
|
||||
|
||||
CQL_GET_ALL_SERVICES = '''
|
||||
SELECT project_id,
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""Storage Driver for CDN"""
|
||||
|
||||
from cdn.storage.mockdb import driver
|
||||
from poppy.storage.mockdb import driver
|
||||
|
||||
# Hoist classes into package namespace
|
||||
Driver = driver.MockDBStorageDriver
|
||||
|
@ -23,6 +23,6 @@ Field Mappings:
|
||||
updated and documented in each controller class.
|
||||
"""
|
||||
|
||||
from cdn.storage.mockdb import services
|
||||
from poppy.storage.mockdb import services
|
||||
|
||||
ServicesController = services.ServicesController
|
||||
|
@ -15,10 +15,10 @@
|
||||
|
||||
"""Storage driver implementation."""
|
||||
|
||||
from cdn.common import decorators
|
||||
from cdn.openstack.common import log as logging
|
||||
from cdn.storage import base
|
||||
from cdn.storage.mockdb import controllers
|
||||
from poppy.common import decorators
|
||||
from poppy.openstack.common import log as logging
|
||||
from poppy.storage import base
|
||||
from poppy.storage.mockdb import controllers
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.storage import base
|
||||
from poppy.storage import base
|
||||
|
||||
|
||||
class ServicesController(base.ServicesController):
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""MongoDB Storage Driver for CDN"""
|
||||
|
||||
from cdn.storage.mongodb import driver
|
||||
from poppy.storage.mongodb import driver
|
||||
|
||||
# Hoist classes into package namespace
|
||||
Driver = driver.MongoDBStorageDriver
|
||||
|
@ -22,6 +22,6 @@ Field Mappings:
|
||||
updated and documented in each controller class.
|
||||
"""
|
||||
|
||||
from cdn.storage.mongodb import services
|
||||
from poppy.storage.mongodb import services
|
||||
|
||||
ServicesController = services.ServicesController
|
||||
|
@ -18,10 +18,10 @@
|
||||
import pymongo
|
||||
import pymongo.errors
|
||||
|
||||
from cdn.common import decorators
|
||||
from cdn.openstack.common import log as logging
|
||||
from cdn.storage import base
|
||||
from cdn.storage.mongodb import controllers
|
||||
from poppy.common import decorators
|
||||
from poppy.openstack.common import log as logging
|
||||
from poppy.storage import base
|
||||
from poppy.storage.mongodb import controllers
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
# stevedore/example/simple.py
|
||||
from cdn.storage import base
|
||||
from poppy.storage import base
|
||||
|
||||
|
||||
class ServicesController(base.ServicesController):
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
"""CDN Transport Drivers"""
|
||||
|
||||
from cdn.transport import base
|
||||
from poppy.transport import base
|
||||
|
||||
|
||||
# Hoist into package namespace
|
||||
|
@ -1,6 +1,6 @@
|
||||
"""Falcon Transport Driver"""
|
||||
|
||||
from cdn.transport.falcon import driver
|
||||
from poppy.transport.falcon import driver
|
||||
|
||||
# Hoist into package namespace
|
||||
Driver = driver.TransportDriver
|
||||
|
@ -20,9 +20,9 @@ import falcon
|
||||
from oslo.config import cfg
|
||||
import six
|
||||
|
||||
import cdn.openstack.common.log as logging
|
||||
import poppy.openstack.common.log as logging
|
||||
from cdn import transport
|
||||
from cdn.transport.falcon import (
|
||||
from poppy.transport.falcon import (
|
||||
v1, services
|
||||
)
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
"""Pecan Transport Driver"""
|
||||
|
||||
from cdn.transport.pecan import driver
|
||||
from poppy.transport.pecan import driver
|
||||
|
||||
|
||||
# Hoist into package namespace
|
||||
|
@ -15,9 +15,9 @@
|
||||
|
||||
"""Pecan Controllers"""
|
||||
|
||||
from cdn.transport.pecan.controllers import root
|
||||
from cdn.transport.pecan.controllers import services
|
||||
from cdn.transport.pecan.controllers import v1
|
||||
from poppy.transport.pecan.controllers import root
|
||||
from poppy.transport.pecan.controllers import services
|
||||
from poppy.transport.pecan.controllers import v1
|
||||
|
||||
|
||||
# Hoist into package namespace
|
||||
|
@ -17,7 +17,7 @@ import re
|
||||
|
||||
import pecan
|
||||
|
||||
from cdn.transport.pecan.controllers import base
|
||||
from poppy.transport.pecan.controllers import base
|
||||
|
||||
|
||||
class RootController(base.Controller):
|
||||
|
@ -17,13 +17,13 @@ import json
|
||||
|
||||
import pecan
|
||||
|
||||
from cdn.openstack.common import local
|
||||
from cdn.transport.pecan.controllers import base
|
||||
from cdn.transport.validators import helpers
|
||||
from cdn.transport.validators.schemas import service
|
||||
from cdn.transport.validators.stoplight import decorators
|
||||
from cdn.transport.validators.stoplight import helpers as stoplight_helpers
|
||||
from cdn.transport.validators.stoplight import rule
|
||||
from poppy.openstack.common import local
|
||||
from poppy.transport.pecan.controllers import base
|
||||
from poppy.transport.validators import helpers
|
||||
from poppy.transport.validators.schemas import service
|
||||
from poppy.transport.validators.stoplight import decorators
|
||||
from poppy.transport.validators.stoplight import helpers as stoplight_helpers
|
||||
from poppy.transport.validators.stoplight import rule
|
||||
|
||||
|
||||
class ServicesController(base.Controller):
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
import pecan
|
||||
|
||||
from cdn.transport.pecan.controllers import base
|
||||
from poppy.transport.pecan.controllers import base
|
||||
|
||||
|
||||
class ControllerV1(base.Controller):
|
||||
|
@ -18,10 +18,10 @@ from wsgiref import simple_server
|
||||
from oslo.config import cfg
|
||||
import pecan
|
||||
|
||||
from cdn.openstack.common import log
|
||||
from poppy.openstack.common import log
|
||||
from cdn import transport
|
||||
from cdn.transport.pecan import controllers
|
||||
from cdn.transport.pecan import hooks
|
||||
from poppy.transport.pecan import controllers
|
||||
from poppy.transport.pecan import hooks
|
||||
|
||||
|
||||
_PECAN_OPTIONS = [
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
"""Pecan Hooks"""
|
||||
|
||||
from cdn.transport.pecan.hooks import context
|
||||
from poppy.transport.pecan.hooks import context
|
||||
|
||||
|
||||
# Hoist into package namespace
|
||||
|
@ -15,8 +15,8 @@
|
||||
|
||||
from pecan import hooks
|
||||
|
||||
from cdn.openstack.common import context
|
||||
from cdn.openstack.common import local
|
||||
from poppy.openstack.common import context
|
||||
from poppy.openstack.common import local
|
||||
|
||||
|
||||
class ContextHook(hooks.PecanHook):
|
||||
|
@ -24,8 +24,8 @@ except ImportError:
|
||||
import jsonschema
|
||||
import pecan
|
||||
|
||||
from cdn.transport.validators.stoplight import decorators
|
||||
from cdn.transport.validators.stoplight import exceptions
|
||||
from poppy.transport.validators.stoplight import decorators
|
||||
from poppy.transport.validators.stoplight import exceptions
|
||||
|
||||
|
||||
def req_accepts_json_pecan(request, desired_content_type='application/json'):
|
||||
|
@ -13,8 +13,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.common import errors
|
||||
from cdn.openstack.common.gettextutils import _
|
||||
from poppy.common import errors
|
||||
from poppy.openstack.common.gettextutils import _
|
||||
|
||||
|
||||
class SchemaBase(object):
|
||||
|
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from cdn.transport.validators import schema_base
|
||||
from poppy.transport.validators import schema_base
|
||||
|
||||
|
||||
class ServiceSchema(schema_base.SchemaBase):
|
||||
|
Loading…
x
Reference in New Issue
Block a user