summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2020-02-19 20:07:44 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-02-20 12:43:14 -0500
commitb1b4fca4f04ba878d7c70c18817deb42eab3b712 (patch)
tree623922ad8aeb7fe5c37e0663460397d905604505 /recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch
parentcac0cdf86d46f7acfba8e6c3931ed72895c056f7 (diff)
downloadmeta-virtualization-b1b4fca4f04ba878d7c70c18817deb42eab3b712.tar.gz
openvswitch: uprev from v2.12 to v2.13
Another straightforward uprev with one fairly large change in the changelog. The Open Virtual Network component has now been moved to its own repo (https://github.com/ovn-org/ovn.git). If you were using this functionality a new recipe will need to be created. The ptest results are similar to after the v2.12 uprev ERROR: 2206 tests were run, 28 failed unexpectedly. 62 tests were skipped. The failed tests were in the following areas: checkpatch.at (5) ovs-ofctl.at (1) tunnel.at(1) tunnel-push-pop.at(3) tunnel-push-pop-ipv6.at(3) dpif-netdev.at (1) pmd.at(1) ofproto-dpif.at (7) bridge.at (2) ovsdb-idl.at(1) mcast-snooping.at(1) packet-type-aware.at(2) None of these affect core functionality or usecases and are similar to the results we see with v1.12. If specific usecases are affected by these failures we should address them on a need to fix basis. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch')
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch b/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch
deleted file mode 100644
index bf49ff65..00000000
--- a/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From d84109f0b60096ce71cd0537b31b69a7f5ea8756 Mon Sep 17 00:00:00 2001
2From: Flavio Leitner <fbl@sysclose.org>
3Date: Sat, 14 Sep 2019 20:17:28 -0300
4Subject: [PATCH] ovsdb-idlc.in: fix dict change during iteration.
5
6Commit d84109f0b600 from git://github.com/openvswitch/ovs.git
7
8Python3 complains if a dict key is changed during the
9iteration.
10
11Use list() to create a copy of it.
12
13Traceback (most recent call last):
14 File "./ovsdb/ovsdb-idlc.in", line 1581, in <module>
15 func(*args[1:])
16 File "./ovsdb/ovsdb-idlc.in", line 185, in printCIDLHeader
17 replace_cplusplus_keyword(schema)
18 File "./ovsdb/ovsdb-idlc.in", line 179, in replace_cplusplus_keyword
19 for columnName in table.columns:
20RuntimeError: dictionary keys changed during iteration
21
22Signed-off-by: Flavio Leitner <fbl@sysclose.org>
23Signed-off-by: Ben Pfaff <blp@ovn.org>
24[MA: Upstream-Status: Submitted]
25Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
26---
27 ovsdb/ovsdb-idlc.in | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
31index 40fef39..22d0a4e 100755
32--- a/ovsdb/ovsdb-idlc.in
33+++ b/ovsdb/ovsdb-idlc.in
34@@ -176,7 +176,7 @@ def replace_cplusplus_keyword(schema):
35 'wchar_t', 'while', 'xor', 'xor_eq'}
36
37 for tableName, table in schema.tables.items():
38- for columnName in table.columns:
39+ for columnName in list(table.columns):
40 if columnName in keywords:
41 table.columns[columnName + '_'] = table.columns.pop(columnName)
42
43--
442.7.4
45