The update of having other_config instead of external_ids
for configuration has been in place for some time.
Version that released with this change was 20.06, that
is plenty of time so we don't have to keep the compatibility
anymore. Remove the updates of external_ids it will be stored
only in other_config from now on.
Signed-off-by: Ales Musil <amu...@redhat.com>
---
v2: Rebase on top of current main.
Address comment from Numan.
---
NEWS | 1 +
TODO.rst | 4 ----
controller/chassis.c | 4 ----
ic/ovn-ic.c | 4 ----
tests/ovn-ic.at | 6 ------
5 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/NEWS b/NEWS
index 20cea579e..de8bc6a8b 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Post v22.06.0
NAT-T UDP encapsulation. Requires OVS support for IPsec custom tunnel
options (which will be available in OVS 2.18).
- Removed possibility of disabling logical datapath groups.
+ - Removed the copying of SB's Chassis other_config into external_ids.
OVN v22.06.0 - 03 Jun 2022
--------------------------
diff --git a/TODO.rst b/TODO.rst
index acbcacc4e..d54817011 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -139,10 +139,6 @@ OVN To-do List
* Packaging for RHEL, Debian, etc.
-* ovn-controller: Stop copying the local OVS configuration into the
- Chassis external_ids column (same for the "is-remote" configuration from
- ovn-ic) a few releases after the 20.06 version (21.06 maybe ?).
-
* ovn-controller: Remove backwards compatibility for Southbound DB Port_Group
names in expr.c a few releases after the 20.09 version. Right now
ovn-controller maintains backwards compatibility when connecting to a
diff --git a/controller/chassis.c b/controller/chassis.c
index ba6377ac2..3d75f10ad 100644
--- a/controller/chassis.c
+++ b/controller/chassis.c
@@ -623,10 +623,6 @@ chassis_update(const struct sbrec_chassis *chassis_rec,
chassis_build_other_config(ovs_cfg, &other_config);
sbrec_chassis_verify_other_config(chassis_rec);
sbrec_chassis_set_other_config(chassis_rec, &other_config);
- /* TODO(lucasagomes): Continue writing the configuration to the
- * external_ids column for backward compatibility with the current
- * systems, this behavior should be removed in the future. */
- sbrec_chassis_set_external_ids(chassis_rec, &other_config);
smap_destroy(&other_config);
updated = true;
}
diff --git a/ic/ovn-ic.c b/ic/ovn-ic.c
index 95a5ff0de..e5c193d9d 100644
--- a/ic/ovn-ic.c
+++ b/ic/ovn-ic.c
@@ -313,10 +313,6 @@ sync_isb_gw_to_sb(struct ic_context *ctx,
{
sbrec_chassis_set_hostname(chassis, gw->hostname);
sbrec_chassis_update_other_config_setkey(chassis, "is-remote", "true");
- /* TODO(lucasagomes): Continue writing the configuration to the
- * external_ids column for backward compatibility with the current
- * systems, this behavior should be removed in the future. */
- sbrec_chassis_update_external_ids_setkey(chassis, "is-remote", "true");
/* Sync encaps used by this gateway. */
ovs_assert(gw->n_encaps);
diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at
index 89f223562..b136472c8 100644
--- a/tests/ovn-ic.at
+++ b/tests/ovn-ic.at
@@ -148,12 +148,6 @@ AT_CHECK([ovn_as az2 ovn-sbctl -f csv -d bare
--no-headings --columns other_conf
is-remote=true
])
-# TODO(lucasagomes): Remove this check when we get rid of the behavior
-# of writting configuration to the Chassis external_ids column.
-AT_CHECK([ovn_as az2 ovn-sbctl -f csv -d bare --no-headings --columns
external_ids list chassis], [0], [dnl
-is-remote=true
-])
-
ovs-vsctl set open . external-ids:ovn-is-interconn=false
AT_CHECK([ovn_as az2 ovn-sbctl show], [0], [dnl
])
--
2.37.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
