openstack/neutron
Code Issues Proposed changes

Merge "Fix port_hardware_offload_type ML2 extension" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-09-06 12:02:08 +00:00 committed by Gerrit Code Review
commit ce64a86cca
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/port_hardware_offload_type_db.py
View File

@ -41,7 +41,7 @@ class PortHardwareOffloadTypeDbMixin(object):
if hw_type not in capabilities: if hw_type not in capabilities:
capabilities.append(hw_type) capabilities.append(hw_type)
data[portbindings.PROFILE]['capabilities'] = capabilities data[portbindings.PROFILE]['capabilities'] = capabilities
except KeyError: except (AttributeError, KeyError):
data[portbindings.PROFILE] = {'capabilities': [hw_type]} data[portbindings.PROFILE] = {'capabilities': [hw_type]}
def _extend_port_dict(self, port_db, result): def _extend_port_dict(self, port_db, result):

2
neutron/plugins/ml2/plugin.py
View File

@ -43,7 +43,6 @@ from neutron_lib.api.definitions import network_mtu as mtu_apidef
from neutron_lib.api.definitions import network_mtu_writable as mtuw_apidef from neutron_lib.api.definitions import network_mtu_writable as mtuw_apidef
from neutron_lib.api.definitions import port as port_def from neutron_lib.api.definitions import port as port_def
from neutron_lib.api.definitions import port_device_profile as pdp_def from neutron_lib.api.definitions import port_device_profile as pdp_def
from neutron_lib.api.definitions import port_hardware_offload_type as phot_def
from neutron_lib.api.definitions import port_mac_address_override from neutron_lib.api.definitions import port_mac_address_override
from neutron_lib.api.definitions import port_mac_address_regenerate from neutron_lib.api.definitions import port_mac_address_regenerate
from neutron_lib.api.definitions import port_numa_affinity_policy as pnap_def from neutron_lib.api.definitions import port_numa_affinity_policy as pnap_def
@ -246,7 +245,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
port_mac_address_override.ALIAS, port_mac_address_override.ALIAS,
sg_default_rules_ext.ALIAS, sg_default_rules_ext.ALIAS,
sg_rules_default_sg.ALIAS, sg_rules_default_sg.ALIAS,
phot_def.ALIAS,
] ]
# List of agent types for which all binding_failed ports should try to be # List of agent types for which all binding_failed ports should try to be