openstack/neutron-fwaas
Code Issues Proposed changes

Merge "Add extraroute_db support for Cisco N1kv Plugin"

Browse Source
This commit is contained in:
Jenkins 2014-03-15 01:22:57 +00:00 committed by Gerrit Code Review
commit 2fdf8ebcdd
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/db/migration/alembic_migrations/versions/1c33fa3cd1a1_extra_route_config.py
View File

@ -41,6 +41,7 @@ migration_for_plugins = [
'neutron.plugins.vmware.plugin.NsxPlugin', 'neutron.plugins.vmware.plugin.NsxPlugin',
'neutron.plugins.vmware.plugin.NsxServicePlugin', 'neutron.plugins.vmware.plugin.NsxServicePlugin',
'neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2', 'neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2',
'neutron.plugins.cisco.network_plugin.PluginV2'
] ]
from alembic import op from alembic import op

2
neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
View File

@ -34,6 +34,7 @@ from neutron.db import agentschedulers_db
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import dhcp_rpc_base from neutron.db import dhcp_rpc_base
from neutron.db import external_net_db from neutron.db import external_net_db
from neutron.db import extraroute_db
from neutron.db import l3_db from neutron.db import l3_db
from neutron.db import l3_rpc_base from neutron.db import l3_rpc_base
from neutron.db import portbindings_db from neutron.db import portbindings_db
@ -76,6 +77,7 @@ class N1kvRpcCallbacks(dhcp_rpc_base.DhcpRpcCallbackMixin,
class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2, class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
external_net_db.External_net_db_mixin, external_net_db.External_net_db_mixin,
extraroute_db.ExtraRoute_db_mixin,
l3_db.L3_NAT_db_mixin, l3_db.L3_NAT_db_mixin,
portbindings_db.PortBindingMixin, portbindings_db.PortBindingMixin,
n1kv_db_v2.NetworkProfile_db_mixin, n1kv_db_v2.NetworkProfile_db_mixin,