Merge "Remove v1 base type"
This commit is contained in:
commit
86812e1309
|
@ -1,19 +0,0 @@
|
||||||
# Copyright 2014 Rackspace
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
from octavia.api.common import types
|
|
||||||
|
|
||||||
IPAddressType = types.IPAddressType
|
|
||||||
URLType = types.URLType
|
|
||||||
BaseType = types.BaseType
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.api.v1.types import l7rule
|
from octavia.api.v1.types import l7rule
|
||||||
from octavia.api.v1.types import pool
|
from octavia.api.v1.types import pool
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.api.v1.types import l7policy
|
from octavia.api.v1.types import l7policy
|
||||||
from octavia.api.v1.types import pool
|
from octavia.api.v1.types import pool
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
|
|
||||||
|
|
||||||
class ListenerStatisticsResponse(base.BaseType):
|
class ListenerStatisticsResponse(base.BaseType):
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.api.v1.types import listener
|
from octavia.api.v1.types import listener
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.api.v1.types import listener_statistics
|
from octavia.api.v1.types import listener_statistics
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
|
|
||||||
|
|
||||||
class MemberResponse(base.BaseType):
|
class MemberResponse(base.BaseType):
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
from octavia.api.v1.types import health_monitor
|
from octavia.api.v1.types import health_monitor
|
||||||
from octavia.api.v1.types import member
|
from octavia.api.v1.types import member
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
from wsme import types as wtypes
|
from wsme import types as wtypes
|
||||||
|
|
||||||
from octavia.api.v1.types import base
|
from octavia.api.common import types as base
|
||||||
|
|
||||||
|
|
||||||
class QuotaBase(base.BaseType):
|
class QuotaBase(base.BaseType):
|
||||||
|
|
|
@ -16,7 +16,7 @@ from oslo_utils import uuidutils
|
||||||
from wsme import exc
|
from wsme import exc
|
||||||
from wsme.rest import json as wsme_json
|
from wsme.rest import json as wsme_json
|
||||||
|
|
||||||
from octavia.api.v1.types import base as base_type
|
from octavia.api.common import types as base_type
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
from octavia.tests.unit import base
|
from octavia.tests.unit import base
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ from oslo_utils import uuidutils
|
||||||
from wsme import exc
|
from wsme import exc
|
||||||
from wsme.rest import json as wsme_json
|
from wsme.rest import json as wsme_json
|
||||||
|
|
||||||
from octavia.api.v1.types import base as base_type
|
from octavia.api.common import types as base_type
|
||||||
from octavia.common import constants
|
from octavia.common import constants
|
||||||
from octavia.tests.unit import base
|
from octavia.tests.unit import base
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue