Merge pull request #46 from stackhpc/upstream/yoga-2023-05-22

Synchronise yoga with upstream

Author: markgoddard

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/commands.py

@@ -11,6 +11,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import collections
+from collections import abc
 
 from oslo_utils import timeutils
 from ovsdbapp.backend.ovs_idl import command
@@ -894,3 +896,35 @@ def run_idl(self, txn):
                 virtual_parents)
 
         setattr(lsp, 'options', options)
+
+
+class DbSetCommand(command.BaseCommand):
+    def __init__(self, api, table, record, *col_values, if_exists=False,
+                 **columns):
+        super().__init__(api)
+        self.table = table
+        self.record = record
+        self.col_values = col_values or columns.items()
+        self.if_exists = if_exists
+
+    def run_idl(self, txn):
+        try:
+            record = self.api.lookup(self.table, self.record)
+        except idlutils.RowNotFound:
+            if self.if_exists:
+                return
+            raise
+
+        for col, val in self.col_values:
+            if isinstance(val, abc.Mapping):
+                if isinstance(val, collections.OrderedDict):
+                    val = dict(val)
+                existing = getattr(record, col, {})
+                existing.update(val)
+                val = existing
+                # Since we are updating certain keys and leaving existing keys
+                # but rewriting the whole external_ids column, we must verify()
+                record.verify(col)
+            # For non-map columns, we unconditionally overwrite the values that
+            # exist, so prior state doesn't matter and we don't need verify()
+            self.set_column(record, col, val)

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py

@@ -811,6 +811,10 @@ def unset_lswitch_port_to_virtual_type(self, lport_name,
     def update_lb_external_ids(self, lb_name, values, if_exists=True):
         return cmd.UpdateLbExternalIds(self, lb_name, values, if_exists)
 
+    def db_set(self, table, record, *col_values, if_exists=True, **columns):
+        return cmd.DbSetCommand(self, table, record, *col_values,
+                                if_exists=if_exists, **columns)
+
 
 class OvsdbSbOvnIdl(sb_impl_idl.OvnSbApiIdlImpl, Backend):
     def __init__(self, connection):
@@ -930,3 +934,7 @@ def get_ports_on_chassis(self, chassis):
         # and just start using chassis objects so db_find_rows could be used
         rows = self.db_list_rows('Port_Binding').execute(check_error=True)
         return [r for r in rows if r.chassis and r.chassis[0].name == chassis]
+
+    def db_set(self, table, record, *col_values, if_exists=True, **columns):
+        return cmd.DbSetCommand(self, table, record, *col_values,
+                                if_exists=if_exists, **columns)