Merge "Fix low-hanging deprecation warnings"
This commit is contained in:
commit
1178aa0e5c
|
@ -22,7 +22,7 @@ import netaddr
|
|||
from neutron.db import l3_db
|
||||
from neutron.db.l3_db import DEVICE_OWNER_ROUTER_INTF
|
||||
from neutron.db.l3_db import EXTERNAL_GW_INFO
|
||||
from neutron.db.l3_db import RouterPort
|
||||
from neutron.db.models.l3 import RouterPort
|
||||
from neutron.db import models_v2
|
||||
from neutron.extensions import l3
|
||||
from neutron.plugins.common import constants as n_const
|
||||
|
|
|
@ -28,9 +28,9 @@ from neutron.agent import securitygroups_rpc
|
|||
from neutron.common import rpc as n_rpc
|
||||
from neutron.common import topics as n_topics
|
||||
from neutron.db import api as db_api
|
||||
from neutron.db import l3_db
|
||||
from neutron.db.models import address_scope as as_db
|
||||
from neutron.db.models import allowed_address_pair as n_addr_pair_db
|
||||
from neutron.db.models import l3 as l3_db
|
||||
from neutron.db.models import securitygroup as sg_models
|
||||
from neutron.db import models_v2
|
||||
from neutron.db import rbac_db_models
|
||||
|
|
|
@ -18,8 +18,8 @@ from neutron.db import common_db_mixin
|
|||
from neutron.db import db_base_plugin_v2
|
||||
from neutron.db import dns_db
|
||||
from neutron.db import extraroute_db
|
||||
from neutron.db import l3_db
|
||||
from neutron.db import l3_gwmode_db
|
||||
from neutron.db.models import l3 as l3_db
|
||||
from neutron.extensions import l3
|
||||
from neutron.extensions import portbindings
|
||||
from neutron.quota import resource_registry
|
||||
|
|
Loading…
Reference in New Issue