Merge "Use constants from neutron-lib"
This commit is contained in:
commit
3fe411aab4
|
@ -17,6 +17,7 @@ import functools
|
||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
from neutron_lib.api.definitions import ip_allocation as ipalloc_apidef
|
from neutron_lib.api.definitions import ip_allocation as ipalloc_apidef
|
||||||
|
from neutron_lib.api.definitions import port as port_def
|
||||||
from neutron_lib.api.definitions import portbindings as portbindings_def
|
from neutron_lib.api.definitions import portbindings as portbindings_def
|
||||||
from neutron_lib.api.definitions import subnetpool as subnetpool_def
|
from neutron_lib.api.definitions import subnetpool as subnetpool_def
|
||||||
from neutron_lib.api import validators
|
from neutron_lib.api import validators
|
||||||
|
@ -1564,8 +1565,7 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon,
|
||||||
marker_obj=marker_obj,
|
marker_obj=marker_obj,
|
||||||
page_reverse=page_reverse)
|
page_reverse=page_reverse)
|
||||||
items = [self._make_port_dict(c, fields, bulk=True) for c in query]
|
items = [self._make_port_dict(c, fields, bulk=True) for c in query]
|
||||||
# TODO(obondarev): use neutron_lib constant
|
resource_extend.apply_funcs(port_def.COLLECTION_NAME_BULK, items, None)
|
||||||
resource_extend.apply_funcs('ports_bulk', items, None)
|
|
||||||
if limit and page_reverse:
|
if limit and page_reverse:
|
||||||
items.reverse()
|
items.reverse()
|
||||||
return items
|
return items
|
||||||
|
|
|
@ -177,8 +177,7 @@ class QoSPlugin(qos.QoSPluginBase):
|
||||||
return [physnet_trait, vnic_trait]
|
return [physnet_trait, vnic_trait]
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
# TODO(obondarev): use neutron_lib constant
|
@resource_extend.extends([port_def.COLLECTION_NAME_BULK])
|
||||||
@resource_extend.extends(['ports_bulk'])
|
|
||||||
def _extend_port_resource_request_bulk(ports_res, noop):
|
def _extend_port_resource_request_bulk(ports_res, noop):
|
||||||
"""Add resource request to a list of ports."""
|
"""Add resource request to a list of ports."""
|
||||||
min_bw_rules = dict()
|
min_bw_rules = dict()
|
||||||
|
|
|
@ -92,8 +92,7 @@ class TrunkPlugin(service_base.ServicePluginBase):
|
||||||
return port_res
|
return port_res
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
# TODO(obondarev): use neutron_lib constant
|
@resource_extend.extends([port_def.COLLECTION_NAME_BULK])
|
||||||
@resource_extend.extends(['ports_bulk'])
|
|
||||||
def _extend_port_trunk_details_bulk(ports_res, noop):
|
def _extend_port_trunk_details_bulk(ports_res, noop):
|
||||||
"""Add trunk subport details to a list of ports."""
|
"""Add trunk subport details to a list of ports."""
|
||||||
subport_ids = []
|
subport_ids = []
|
||||||
|
|
Loading…
Reference in New Issue