From 5941a3b0aec8d5f8cdadc01d44e707b68c7a6825 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Sep 20 2022 02:03:57 +0000
Subject: Import openvswitch2.15-2.15.0-121 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index a6f53ff..2a32faa 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -105385,7 +105385,7 @@ index 8aec6bbac1..ba55566926 100644
  from collections import Sequence, MutableSequence
  from functools import wraps
 diff --git a/python/ovs/db/idl.py b/python/ovs/db/idl.py
-index 5850ac7abf..7ecaeee6d5 100644
+index 5850ac7abf..859e4bb2ac 100644
 --- a/python/ovs/db/idl.py
 +++ b/python/ovs/db/idl.py
 @@ -12,6 +12,7 @@
@@ -105610,7 +105610,17 @@ index 5850ac7abf..7ecaeee6d5 100644
  
      def __check_server_db(self):
          """Returns True if this is a valid server database, False otherwise."""
-@@ -1458,6 +1490,11 @@ class Transaction(object):
+@@ -999,7 +1031,8 @@ class Row(object):
+         return "{table}({data})".format(
+             table=self._table.name,
+             data=", ".join("{col}={val}".format(col=c, val=getattr(self, c))
+-                           for c in sorted(self._table.columns)))
++                           for c in sorted(self._table.columns)
++                           if hasattr(self, c)))
+ 
+     def __getattr__(self, column_name):
+         assert self._changes is not None
+@@ -1458,6 +1491,11 @@ class Transaction(object):
          if self != self.idl.txn:
              return self._status
  
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 4762dcf..f921b60 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 120%{?dist}
+Release: 121%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Sep 19 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-121
+- Merging upstream branch-2.15 [RH git: 6af245093e]
+    Commit list:
+    fcc8774005 python: idl: Fix idl.Row.__str__ method.
+
+
 * Mon Sep 19 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-120
 - Merging upstream branch-2.15 [RH git: 64fdb5d43f]
     Commit list: