x
/
trio2o
Code Issues Proposed changes

Fix network plugin database model init failure 

Currently network plugin imports neutron.db.l3_db, which results
in database model init failure because of some dependency errors.
Since l3 functionality is not implemented yet in network plugin,
remove this import to avoid the failure.

Change-Id: I1e9585f5061d334bfb7752d9934f65b50c1d471b
This commit is contained in:
zhiyuan_cai 2015-12-26 11:59:03 +08:00
parent b2b786518f
commit 50176d04aa
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tricircle/network/plugin.py
View File

@ -21,7 +21,6 @@ from neutron.db import agentschedulers_db
from neutron.db import db_base_plugin_v2
from neutron.db import external_net_db
from neutron.db import extradhcpopt_db
from neutron.db import l3_db
from neutron.db import models_v2
from neutron.db import portbindings_db
from neutron.db import securitygroups_db
@ -42,7 +41,6 @@ LOG = log.getLogger(__name__)
class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2,
securitygroups_db.SecurityGroupDbMixin,
l3_db.L3_NAT_dbonly_mixin,
external_net_db.External_net_db_mixin,
portbindings_db.PortBindingMixin,
extradhcpopt_db.ExtraDhcpOptMixin,
@ -56,8 +54,7 @@ class TricirclePlugin(db_base_plugin_v2.NeutronDbPluginV2,
"extra_dhcp_opt",
"binding",
"security-group",
"external-net",
"router"]
"external-net"]
def __init__(self):
super(TricirclePlugin, self).__init__()