diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index 8a67a20a30b..9eed74b4327 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -17,6 +17,7 @@ import functools import netaddr 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 subnetpool as subnetpool_def from neutron_lib.api import validators @@ -1564,8 +1565,7 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon, marker_obj=marker_obj, page_reverse=page_reverse) items = [self._make_port_dict(c, fields, bulk=True) for c in query] - # TODO(obondarev): use neutron_lib constant - resource_extend.apply_funcs('ports_bulk', items, None) + resource_extend.apply_funcs(port_def.COLLECTION_NAME_BULK, items, None) if limit and page_reverse: items.reverse() return items diff --git a/neutron/services/qos/qos_plugin.py b/neutron/services/qos/qos_plugin.py index 81b12cfc1c5..c56db9c8975 100644 --- a/neutron/services/qos/qos_plugin.py +++ b/neutron/services/qos/qos_plugin.py @@ -177,8 +177,7 @@ class QoSPlugin(qos.QoSPluginBase): return [physnet_trait, vnic_trait] @staticmethod - # TODO(obondarev): use neutron_lib constant - @resource_extend.extends(['ports_bulk']) + @resource_extend.extends([port_def.COLLECTION_NAME_BULK]) def _extend_port_resource_request_bulk(ports_res, noop): """Add resource request to a list of ports.""" min_bw_rules = dict() diff --git a/neutron/services/trunk/plugin.py b/neutron/services/trunk/plugin.py index 27262e8eb8e..0b3b0e8d072 100644 --- a/neutron/services/trunk/plugin.py +++ b/neutron/services/trunk/plugin.py @@ -92,8 +92,7 @@ class TrunkPlugin(service_base.ServicePluginBase): return port_res @staticmethod - # TODO(obondarev): use neutron_lib constant - @resource_extend.extends(['ports_bulk']) + @resource_extend.extends([port_def.COLLECTION_NAME_BULK]) def _extend_port_trunk_details_bulk(ports_res, noop): """Add trunk subport details to a list of ports.""" subport_ids = []