x/vmware-nsx
Code Issues Proposed changes

Remove deprecation warning - security group db

Browse Source 
Security groups structures moved from: neutron.db.securitygroups_db
to: neutron.db.models.securitygroup

Change-Id: I53687f96ff5170a9c35be7b19f5011171092a628
This commit is contained in:
Adit Sarfaty 2016-08-15 12:12:32 +03:00
parent 290d75a34a
commit 4950717f95
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/db/extended_security_group.py
View File

@ -22,7 +22,7 @@ from neutron.common import utils as n_utils
from neutron.db import api as db_api from neutron.db import api as db_api
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import model_base from neutron.db import model_base
from neutron.db import securitygroups_db from neutron.db.models import securitygroup as securitygroups_db # noqa
from neutron.extensions import securitygroup as ext_sg from neutron.extensions import securitygroup as ext_sg
from neutron_lib.api import validators from neutron_lib.api import validators
from neutron_lib import constants as n_constants from neutron_lib import constants as n_constants

5
vmware_nsx/plugins/dvs/plugin.py
View File

@ -24,6 +24,7 @@ from neutron.db import allowedaddresspairs_db as addr_pair_db
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import external_net_db from neutron.db import external_net_db
from neutron.db import l3_db from neutron.db import l3_db
from neutron.db.models import securitygroup as securitygroup_model # noqa
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.db import portbindings_db from neutron.db import portbindings_db
from neutron.db import portsecurity_db from neutron.db import portsecurity_db
@ -82,8 +83,8 @@ class NsxDvsV2(addr_pair_db.AllowedAddressPairsMixin,
port=models_v2.Port, port=models_v2.Port,
subnet=models_v2.Subnet, subnet=models_v2.Subnet,
subnetpool=models_v2.SubnetPool, subnetpool=models_v2.SubnetPool,
security_group=securitygroups_db.SecurityGroup, security_group=securitygroup_model.SecurityGroup,
security_group_rule=securitygroups_db.SecurityGroupRule) security_group_rule=securitygroup_model.SecurityGroupRule)
def __init__(self): def __init__(self):
super(NsxDvsV2, self).__init__() super(NsxDvsV2, self).__init__()
LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled()) LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled())

5
vmware_nsx/plugins/nsx_mh/plugin.py
View File

@ -42,6 +42,7 @@ from neutron.db import extraroute_db
from neutron.db import l3_db from neutron.db import l3_db
from neutron.db import l3_dvr_db from neutron.db import l3_dvr_db
from neutron.db import l3_gwmode_db from neutron.db import l3_gwmode_db
from neutron.db.models import securitygroup as securitygroup_model # noqa
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.db import portbindings_db from neutron.db import portbindings_db
from neutron.db import portsecurity_db from neutron.db import portsecurity_db
@ -140,8 +141,8 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
port=models_v2.Port, port=models_v2.Port,
subnet=models_v2.Subnet, subnet=models_v2.Subnet,
subnetpool=models_v2.SubnetPool, subnetpool=models_v2.SubnetPool,
security_group=securitygroups_db.SecurityGroup, security_group=securitygroup_model.SecurityGroup,
security_group_rule=securitygroups_db.SecurityGroupRule, security_group_rule=securitygroup_model.SecurityGroupRule,
router=l3_db.Router, router=l3_db.Router,
floatingip=l3_db.FloatingIP) floatingip=l3_db.FloatingIP)
def __init__(self): def __init__(self):

5
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -47,6 +47,7 @@ from neutron.db import external_net_db
from neutron.db import extraroute_db from neutron.db import extraroute_db
from neutron.db import l3_db from neutron.db import l3_db
from neutron.db import l3_gwmode_db from neutron.db import l3_gwmode_db
from neutron.db.models import securitygroup as securitygroup_model # noqa
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.db import portbindings_db from neutron.db import portbindings_db
from neutron.db import portsecurity_db from neutron.db import portsecurity_db
@ -167,8 +168,8 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
port=models_v2.Port, port=models_v2.Port,
subnet=models_v2.Subnet, subnet=models_v2.Subnet,
subnetpool=models_v2.SubnetPool, subnetpool=models_v2.SubnetPool,
security_group=securitygroups_db.SecurityGroup, security_group=securitygroup_model.SecurityGroup,
security_group_rule=securitygroups_db.SecurityGroupRule, security_group_rule=securitygroup_model.SecurityGroupRule,
router=l3_db.Router, router=l3_db.Router,
floatingip=l3_db.FloatingIP) floatingip=l3_db.FloatingIP)
def __init__(self): def __init__(self):

5
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -40,6 +40,7 @@ from neutron.db import extradhcpopt_db
from neutron.db import extraroute_db from neutron.db import extraroute_db
from neutron.db import l3_db from neutron.db import l3_db
from neutron.db import l3_gwmode_db from neutron.db import l3_gwmode_db
from neutron.db.models import securitygroup as securitygroup_model # noqa
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.db import portbindings_db from neutron.db import portbindings_db
from neutron.db import portsecurity_db from neutron.db import portsecurity_db
@ -155,8 +156,8 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
port=models_v2.Port, port=models_v2.Port,
subnet=models_v2.Subnet, subnet=models_v2.Subnet,
subnetpool=models_v2.SubnetPool, subnetpool=models_v2.SubnetPool,
security_group=securitygroups_db.SecurityGroup, security_group=securitygroup_model.SecurityGroup,
security_group_rule=securitygroups_db.SecurityGroupRule, security_group_rule=securitygroup_model.SecurityGroupRule,
router=l3_db.Router, router=l3_db.Router,
floatingip=l3_db.FloatingIP) floatingip=l3_db.FloatingIP)
def __init__(self): def __init__(self):