Merge "Remove v1 base type"

octavia/api/v1/types/base.py

@@ -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

octavia/api/v1/types/health_monitor.py

@@ -14,7 +14,7 @@
 
 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
 
 

octavia/api/v1/types/l7policy.py

@@ -14,7 +14,7 @@
 
 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 pool
 from octavia.common import constants

octavia/api/v1/types/l7rule.py

@@ -14,7 +14,7 @@
 
 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
 
 

octavia/api/v1/types/listener.py

@@ -14,7 +14,7 @@
 
 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 pool
 from octavia.common import constants

octavia/api/v1/types/listener_statistics.py

@@ -14,7 +14,7 @@
 
 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):

octavia/api/v1/types/load_balancer.py

@@ -14,7 +14,7 @@
 
 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
 
 

octavia/api/v1/types/load_balancer_statistics.py

@@ -14,7 +14,7 @@
 
 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
 
 

octavia/api/v1/types/member.py

@@ -14,7 +14,7 @@
 
 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):

octavia/api/v1/types/pool.py

@@ -14,7 +14,7 @@
 
 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 member
 from octavia.common import constants

octavia/api/v1/types/quotas.py

@@ -14,7 +14,7 @@
 
 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):

octavia/tests/unit/api/common/base.py

@@ -16,7 +16,7 @@ from oslo_utils import uuidutils
 from wsme import exc
 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.tests.unit import base
 

octavia/tests/unit/api/v2/types/base.py

@@ -16,7 +16,7 @@ from oslo_utils import uuidutils
 from wsme import exc
 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.tests.unit import base