Synchronise yoga with upstream #29
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
In Change Ib597b62017b56b41009dd4d7359e169f424272b0, the 'qos' service_plugin is enabled when doing an ovn_db_sync. However, if the 'qos' extension_driver is not installed, it will error out. Append 'qos' extension_driver when using sync to fix this issue. Closes-Bug: #1988577 Change-Id: I422d86b8e5650ced4e2cc722cea9cc30061905b4
Format correctly (dialect=mac_unix_expanded) the MAC addresses in
``DHCPAgentOVSTestFramework``. Before this patch, this is the leases
file the DHCP server was using:
Done building initial lease file
/tmp/tmp3_m7_fqk/tmpiadm5q0e/9afb0444-e28e-4582-abb0-031d6ed500e4/leases
with contents:
1676775199 24:77:3:7d:0:4c 192.168.10.11 * *
1676775199 24:77:3:7d:0:3a 192.168.10.1 * *
Related-Bug: #2007992
Change-Id: Ie903fd3f645f7428854cf6b2fe48a1edf342cc32
(cherry picked from commit c61ce34)
A recent change [1] to show the real heartbeat timestamp from OVN agents
had a side effect of changing the timestamp format, which now includes a
timezone:
+-------------------+----------------------------------+
| Field | Value |
+-------------------+----------------------------------+
| last_heartbeat_at | 2023-02-23 14:12:07.471000+00:00 |
+-------------------+----------------------------------+
This unexpected format change causes some clients to fail to parse the
response to GET /v2.0/agents.
Normalise the format of the timestamp to remove timezone information.
Also remove the microsecond part, which was not done for OVN, but is
absent from other network agents.
[1] https://review.opendev.org/c/openstack/neutron/+/844179
Closes-Bug: #2008257
Change-Id: I75a37fb9b49a421e4524da6b56ef8362ceb6107b
(cherry picked from commit 827fbd0)
…" into stable/yoga
github-actions
bot
added
automated
priteau
approved these changes
Mar 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of yoga from upstream.