[ovs-git] [openvswitch/ovs] 38a212: ovs-save: Save igmp flows in ofp_parse syntax.

[otherwiseguy]

  Branch: refs/heads/branch-2.16
  Home:   https://github.com/openvswitch/ovs
  Commit: 38a2129524b886862830fde792fd02c5c9317fe6
      https://github.com/openvswitch/ovs/commit/38a2129524b886862830fde792fd02c5c9317fe6
  Author: Salvatore Daniele <sdaniele at redhat.com>
  Date:   2021-11-29 (Mon, 29 Nov 2021)

  Changed paths:
    M utilities/ovs-save

  Log Message:
  -----------
  ovs-save: Save igmp flows in ofp_parse syntax.

match.c generates the keyword "igmp", which is not supported in ofp-parse.
This means that flow dumps containing 'igmp' can not be restored.

Removing the 'igmp' keyword entirely could break existing scripts in stable
branches, so this patch creates a workaround within ovs-save by converting any
instances of "igmp" within $bridge.flows.dump into "ip, nw_proto=2", and any
instances of igmp_type/code into the generic tp_src/dst.

Signed-off-by: Salvatore Daniele <sdaniele at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: ab01177637b6c66a9f7107f58d1e02d4429949a5
      https://github.com/openvswitch/ovs/commit/ab01177637b6c66a9f7107f58d1e02d4429949a5
  Author: lic121 <lic121 at chinatelecom.cn>
  Date:   2021-11-29 (Mon, 29 Nov 2021)

  Changed paths:
    M Documentation/intro/install/dpdk.rst

  Log Message:
  -----------
  docs/dpdk: Fix install doc.

Remove bad quotes.

Signed-off-by: lic121 <lic121 at chinatelecom.cn>
Acked-by: Eelco Chaudron <echaudro at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: 2d65b8ffd24eb9b16c0a5dc0b6f1fe6f4044cf9b
      https://github.com/openvswitch/ovs/commit/2d65b8ffd24eb9b16c0a5dc0b6f1fe6f4044cf9b
  Author: Terry Wilson <twilson at redhat.com>
  Date:   2021-11-29 (Mon, 29 Nov 2021)

  Changed paths:
    M utilities/ovs-lib.in

  Log Message:
  -----------
  ovs-lib: Backup and remove existing DB when joining cluster.

ovsdb-tool join-cluster requires a remote addr, so the existing
code that tried to join a cluster without it when there was an
existing $DB_FILE would fail.

Instead, if we are trying to specifically join a cluster and there
is an existing $DB_FILE, back it up and remove the original before
continuing to join the cluster.

Signed-off-by: Terry Wilson <twilson at redhat.com>
Acked-by: Dumitru Ceara <dceara at redhat.com>
Acked-by: Flavio Fernandes <flavio at flaviof.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/dc77857ce20d...2d65b8ffd24e