![Itsuro Oda](/assets/img/avatar_default.png)
"l3_plugin_list" configuration parameter of the metaplugin is permitted blank now. If "l3_plugin_list" is blank, router extension and extensions which extend the router extension don't be included in "supported-extension-aliases" of the metaplugin. This makes the metaplugin be able to be used with a router service plugin. Note that if "l3_plugin_list" is not blank, a router service plugin must not be specified, otherwise the error of the bug report still occurs. This patch removes some router extension related meaningless codes also. (e.g. external-net extension belongs to L2 functionality and be handled by core plugins properly.) Closes-bug: 1266347 DocImpact Change-Id: I0454bc0a4bd7eda5dad18b0538fb7baebe0b9f91
73 lines
2.5 KiB
Python
73 lines
2.5 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012, Nachi Ueno, NTT MCL, Inc.
|
|
#
|
|
# 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 neutron.db import db_base_plugin_v2
|
|
from neutron.db import external_net_db
|
|
from neutron.db import l3_gwmode_db
|
|
|
|
|
|
class Fake1(db_base_plugin_v2.NeutronDbPluginV2,
|
|
external_net_db.External_net_db_mixin,
|
|
l3_gwmode_db.L3_NAT_db_mixin):
|
|
supported_extension_aliases = ['external-net', 'router']
|
|
|
|
def fake_func(self):
|
|
return 'fake1'
|
|
|
|
def create_network(self, context, network):
|
|
session = context.session
|
|
with session.begin(subtransactions=True):
|
|
net = super(Fake1, self).create_network(context, network)
|
|
self._process_l3_create(context, net, network['network'])
|
|
return net
|
|
|
|
def update_network(self, context, id, network):
|
|
session = context.session
|
|
with session.begin(subtransactions=True):
|
|
net = super(Fake1, self).update_network(context, id,
|
|
network)
|
|
self._process_l3_update(context, net, network['network'])
|
|
return net
|
|
|
|
def delete_network(self, context, id):
|
|
return super(Fake1, self).delete_network(context, id)
|
|
|
|
def create_port(self, context, port):
|
|
port = super(Fake1, self).create_port(context, port)
|
|
return port
|
|
|
|
def create_subnet(self, context, subnet):
|
|
subnet = super(Fake1, self).create_subnet(context, subnet)
|
|
return subnet
|
|
|
|
def update_port(self, context, id, port):
|
|
port = super(Fake1, self).update_port(context, id, port)
|
|
return port
|
|
|
|
def delete_port(self, context, id, l3_port_check=True):
|
|
if l3_port_check:
|
|
self.prevent_l3_port_deletion(context, id)
|
|
self.disassociate_floatingips(context, id)
|
|
return super(Fake1, self).delete_port(context, id)
|
|
|
|
|
|
class Fake2(Fake1):
|
|
def fake_func(self):
|
|
return 'fake2'
|
|
|
|
def fake_func2(self):
|
|
return 'fake2'
|