Merge pull request #29 from stackhpc/upstream/yoga-2023-03-01

Synchronise yoga with upstream

Author: priteau

neutron/cmd/ovn/neutron_ovn_db_sync_util.py

@@ -203,6 +203,9 @@ def main():
             'port_forwarding',
             'qos'
         ]
+        extension_drivers = list(set(cfg.CONF.ml2.extension_drivers + ['qos']))
+        cfg.CONF.set_override('extension_drivers', extension_drivers, 'ml2')
+
     else:
         LOG.error('Invalid core plugin : ["%s"].', cfg.CONF.core_plugin)
         return

neutron/plugins/ml2/drivers/ovn/agent/neutron_agent.py

@@ -81,7 +81,8 @@ def as_dict(self):
         return {
             'binary': self.binary,
             'host': self.chassis.hostname,
-            'heartbeat_timestamp': self.updated_at,
+            'heartbeat_timestamp': timeutils.normalize_time(
+                self.updated_at.replace(microsecond=0)),
             'availability_zone': ', '.join(
                 ovn_utils.get_chassis_availability_zones(self.chassis)),
             'topic': 'n/a',

neutron/tests/functional/agent/test_dhcp_agent.py

@@ -20,6 +20,7 @@
 import eventlet
 import fixtures
 import netaddr
+from neutron_lib.api import converters
 from neutron_lib import constants as lib_const
 from oslo_config import fixture as fixture_config
 from oslo_utils import uuidutils
@@ -42,10 +43,10 @@
 
 class DHCPAgentOVSTestFramework(base.BaseSudoTestCase):
 
-    _DHCP_PORT_MAC_ADDRESS = netaddr.EUI("24:77:03:7d:00:4c")
-    _DHCP_PORT_MAC_ADDRESS.dialect = netaddr.mac_unix
-    _TENANT_PORT_MAC_ADDRESS = netaddr.EUI("24:77:03:7d:00:3a")
-    _TENANT_PORT_MAC_ADDRESS.dialect = netaddr.mac_unix
+    _DHCP_PORT_MAC_ADDRESS = converters.convert_to_sanitized_mac_address(
+        '24:77:03:7d:00:4c')
+    _TENANT_PORT_MAC_ADDRESS = converters.convert_to_sanitized_mac_address(
+        '24:77:03:7d:00:3a')
 
     _IP_ADDRS = {
         4: {'addr': '192.168.10.11',
@@ -307,9 +308,8 @@ def test_bad_address_allocation(self):
         network, port = self._get_network_port_for_allocation_test()
         network.ports.append(port)
         self.configure_dhcp_for_network(network=network)
-        bad_mac_address = netaddr.EUI(self._TENANT_PORT_MAC_ADDRESS.value + 1)
-        bad_mac_address.dialect = netaddr.mac_unix
-        port.mac_address = str(bad_mac_address)
+        port.mac_address = converters.convert_to_sanitized_mac_address(
+            '24:77:03:7d:00:4d')
         self._plug_port_for_dhcp_request(network, port)
         self.assert_bad_allocation_for_port(network, port)
 

neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py

@@ -1148,7 +1148,7 @@ def test_agent_show_real_heartbeat_timestamp(self):
                 'Chassis_Private', self.chassis, 'nb_cfg_timestamp'
             ).execute(check_error=True)
             updated_at = datetime.datetime.fromtimestamp(
-                int(chassis_ts / 1000), datetime.timezone.utc)
+                int(chassis_ts / 1000))
             # if table Chassis_Private present, agent.updated_at is
             # Chassis_Private.nb_cfg_timestamp
             self.assertEqual(updated_at, heartbeat_timestamp)

neutron/tests/unit/plugins/ml2/drivers/ovn/agent/test_neutron_agent.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import datetime
 from unittest import mock
 
 import eventlet
@@ -67,3 +68,19 @@ def test_agents_by_chassis_private(self):
         agents = list(agents)
         self.assertEqual(1, len(agents))
         self.assertEqual('chassis5', agents[0].agent_id)
+
+    @mock.patch.object(neutron_agent.ControllerAgent, 'alive')
+    def test_heartbeat_timestamp_format(self, agent_alive):
+        chassis_private = fakes.FakeOvsdbRow.create_one_ovsdb_row(
+            attrs={'name': 'chassis5'})
+        agents = self.agent_cache.agents_by_chassis_private(chassis_private)
+        agent = list(agents)[0]
+        agent.chassis.hostname = 'fake-hostname'
+        agent.updated_at = datetime.datetime(
+            year=2023, month=2, day=23, hour=1, minute=2, second=3,
+            microsecond=456789).replace(tzinfo=datetime.timezone.utc)
+        agent_alive.return_value = True
+
+        # Verify that both microseconds and timezone are dropped
+        self.assertEqual(str(agent.as_dict()['heartbeat_timestamp']),
+                         '2023-02-23 01:02:03')

releasenotes/notes/fix-ovn-agent-heartbeat-timestamp-format-dcf80badbe267c68.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Normalise OVN agent heartbeat timestamp format to match other agent types.
+    This fixes parsing of ``GET /v2.0/agents`` for some clients, such as
+    gophercloud.