starlingx/openstack-armada-app
Code Issues Proposed changes

Merge "Add SR-IOV bridge mappings for DHCP support"

Browse Source
This commit is contained in:
Zuul
2025-06-05 21:38:38 +00:00
committed by Gerrit Code Review
parent 9b2bdefbce 33641c7cff
commit e9c5510420
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py
View File

@@ -153,7 +153,7 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
bridges = {} bridges = {}
index = 0 index = 0
for iface in self.interfaces_by_hostid.get(host.id, []): for iface in self.interfaces_by_hostid.get(host.id, []):
if self._is_data_network_type(iface): if self._is_data_network_type(iface) or self._is_sriov_network_type(iface):
if any(dn.datanetwork_network_type in if any(dn.datanetwork_network_type in
[constants.DATANETWORK_TYPE_FLAT, [constants.DATANETWORK_TYPE_FLAT,
constants.DATANETWORK_TYPE_VLAN] for dn in constants.DATANETWORK_TYPE_VLAN] for dn in
@@ -171,16 +171,14 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
bridge_mappings = "" bridge_mappings = ""
index = 0 index = 0
for iface in self.interfaces_by_hostid.get(host.id, []): for iface in self.interfaces_by_hostid.get(host.id, []):
if self._is_data_network_type(iface): if self._is_data_network_type(iface) or self._is_sriov_network_type(iface):
# obtain the assigned bridge for interface
brname = 'br-phy%d' % index
if brname:
datanets = self.ifdatanets_by_ifaceid.get(iface.id, []) datanets = self.ifdatanets_by_ifaceid.get(iface.id, [])
for datanet in datanets: for datanet in datanets:
dn_name = datanet['datanetwork_name'].strip() dn_name = datanet['datanetwork_name'].strip()
LOG.debug('_get_dynamic_ovs_agent_config ' LOG.debug('_get_dynamic_ovs_agent_config '
'host=%s datanet=%s', host.hostname, dn_name) 'host=%s datanet=%s', host.hostname, dn_name)
if (datanet.datanetwork_network_type == if (self._is_data_network_type(iface) and
datanet.datanetwork_network_type ==
constants.DATANETWORK_TYPE_VXLAN): constants.DATANETWORK_TYPE_VXLAN):
local_ip = self._get_interface_primary_address( local_ip = self._get_interface_primary_address(
self.context, host, iface) self.context, host, iface)
@@ -188,6 +186,7 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
elif (datanet.datanetwork_network_type in elif (datanet.datanetwork_network_type in
[constants.DATANETWORK_TYPE_FLAT, [constants.DATANETWORK_TYPE_FLAT,
constants.DATANETWORK_TYPE_VLAN]): constants.DATANETWORK_TYPE_VLAN]):
brname = 'br-phy%d' % index
bridge_mappings += ('%s:%s,' % (dn_name, brname)) bridge_mappings += ('%s:%s,' % (dn_name, brname))
index += 1 index += 1