Merge "[DHCP agent] Fetch OVN Metadata port from plugin" into stable/yoga

Author: Zuul

neutron/agent/linux/dhcp.py

@@ -1144,7 +1144,8 @@ def _get_ovn_metadata_port_ip(self, subnet):
         m_ports = [port for port in self.network.ports if
                    self._is_ovn_metadata_port(port, self.network.id)]
         if m_ports:
-            for fixed_ip in m_ports[0].fixed_ips:
+            port = self.device_manager.plugin.get_dhcp_port(m_ports[0].id)
+            for fixed_ip in port.fixed_ips:
                 if fixed_ip.subnet_id == subnet.id:
                     return fixed_ip.ip_address
 

neutron/tests/unit/agent/linux/test_dhcp.py

@@ -3126,6 +3126,8 @@ def test__generate_opts_per_subnet_no_metadata(self):
     def test__generate_opts_per_subnet_with_metadata_port(self):
         config = {'enable_isolated_metadata': False,
                   'force_metadata': False}
+        self.mock_mgr.return_value.plugin.get_dhcp_port.return_value = \
+            FakeOvnMetadataPort()
         self._test__generate_opts_per_subnet_helper(config, True,
             network_class=FakeNetworkDhcpandOvnMetadataPort)