x/vmware-nsx
Code Issues Proposed changes

use flavors api def from neutron-lib

Browse Source 
The flavors extension's API definition was rehomed into neutron-lib with
commit I0229a80bb168bac8dc0fa17fb2b06f1b140d27b4 and will be consumed in
neutron with I265ac1c0596d0fb0acaf99eeb7cfe9501732476f
This patch follows suit, consuming the rehomed code from neutron-lib.

Change-Id: I2db5b99e3b9564256458bdbaab692a62bc26d4f6
This commit is contained in:
Boden R 2017-11-14 10:48:23 -07:00
parent ce78bf60f6
commit c7f6a4396c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ from neutron_lib import context as n_context
from neutron_lib.db import constants as db_const from neutron_lib.db import constants as db_const
from neutron_lib import exceptions as n_exc from neutron_lib import exceptions as n_exc
from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.exceptions import allowedaddresspairs as addr_exc
from neutron_lib.exceptions import flavors as flav_exc
from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.exceptions import l3 as l3_exc
from neutron_lib.exceptions import port_security as psec_exc from neutron_lib.exceptions import port_security as psec_exc
from neutron_lib.plugins import constants as plugin_const from neutron_lib.plugins import constants as plugin_const
@ -78,7 +79,6 @@ from neutron.db import portsecurity_db
from neutron.db import quota_db # noqa from neutron.db import quota_db # noqa
from neutron.db import securitygroups_db from neutron.db import securitygroups_db
from neutron.db import vlantransparent_db from neutron.db import vlantransparent_db
from neutron.extensions import flavors
from neutron.extensions import multiprovidernet as mpnet from neutron.extensions import multiprovidernet as mpnet
from neutron.extensions import providernet from neutron.extensions import providernet
from neutron.extensions import securitygroup as ext_sg from neutron.extensions import securitygroup as ext_sg
@ -2919,11 +2919,11 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
fl_db = flavors_plugin.FlavorsPlugin.get_flavor( fl_db = flavors_plugin.FlavorsPlugin.get_flavor(
flv_plugin, context, flavor_id) flv_plugin, context, flavor_id)
if fl_db['service_type'] != plugin_const.L3: if fl_db['service_type'] != plugin_const.L3:
raise flavors.InvalidFlavorServiceType( raise n_exc.InvalidFlavorServiceType(
service_type=fl_db['service_type']) service_type=fl_db['service_type'])
if not fl_db['enabled']: if not fl_db['enabled']:
raise flavors.FlavorDisabled() raise flav_exc.FlavorDisabled()
# get the profile (Currently only 1 is supported, so take the first) # get the profile (Currently only 1 is supported, so take the first)
if not fl_db['service_profiles']: if not fl_db['service_profiles']: