openstack/neutron
Code Issues Proposed changes

Merge "Renamed subnet_service_type_db_models module"

Browse Source
This commit is contained in:
Zuul 2018-04-13 10:41:54 +00:00 committed by Gerrit Code Review
commit 05d5ff228f
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/db/subnet_service_type_db_models.py → neutron/db/subnet_service_type_mixin.py
View File

@ -13,9 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# TODO(ihrachys): consider renaming the module since now it does not contain
# any models at all
from neutron_lib.api.definitions import subnet as subnet_def from neutron_lib.api.definitions import subnet as subnet_def
from neutron.db import _resource_extend as resource_extend from neutron.db import _resource_extend as resource_extend

4
neutron/plugins/ml2/plugin.py
View File

@ -81,7 +81,7 @@ from neutron.db import provisioning_blocks
from neutron.db.quota import driver # noqa from neutron.db.quota import driver # noqa
from neutron.db import securitygroups_rpc_base as sg_db_rpc from neutron.db import securitygroups_rpc_base as sg_db_rpc
from neutron.db import segments_db from neutron.db import segments_db
from neutron.db import subnet_service_type_db_models as service_type_db from neutron.db import subnet_service_type_mixin
from neutron.db import vlantransparent_db from neutron.db import vlantransparent_db
from neutron.extensions import providernet as provider from neutron.extensions import providernet as provider
from neutron.extensions import vlantransparent from neutron.extensions import vlantransparent
@ -126,7 +126,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
vlantransparent_db.Vlantransparent_db_mixin, vlantransparent_db.Vlantransparent_db_mixin,
extradhcpopt_db.ExtraDhcpOptMixin, extradhcpopt_db.ExtraDhcpOptMixin,
address_scope_db.AddressScopeDbMixin, address_scope_db.AddressScopeDbMixin,
service_type_db.SubnetServiceTypeMixin): subnet_service_type_mixin.SubnetServiceTypeMixin):
"""Implement the Neutron L2 abstractions using modules. """Implement the Neutron L2 abstractions using modules.

4
neutron/tests/unit/extensions/test_subnet_service_types.py
View File

@ -15,7 +15,7 @@ import webob.exc
from neutron_lib.api.definitions import portbindings from neutron_lib.api.definitions import portbindings
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import subnet_service_type_db_models from neutron.db import subnet_service_type_mixin
from neutron.extensions import subnet_service_types from neutron.extensions import subnet_service_types
from neutron.tests.unit.db import test_db_base_plugin_v2 from neutron.tests.unit.db import test_db_base_plugin_v2
@ -38,7 +38,7 @@ class SubnetServiceTypesExtensionManager(object):
class SubnetServiceTypesExtensionTestPlugin( class SubnetServiceTypesExtensionTestPlugin(
db_base_plugin_v2.NeutronDbPluginV2, db_base_plugin_v2.NeutronDbPluginV2,
subnet_service_type_db_models.SubnetServiceTypeMixin): subnet_service_type_mixin.SubnetServiceTypeMixin):
"""Test plugin to mixin the subnet service_types extension. """Test plugin to mixin the subnet service_types extension.
""" """