The commit mentioned below removed bunch of features, however in
order for ovn-controller to work with older northd we need to
report them. Those features can be removed once we release the
next LTS. As the upgrade beyond the next LTS is not supported.
Fixes: 92ba14e0d34e ("features: Consolidate chassis features usage, reporting
and testing.")
Signed-off-by: Ales Musil <[email protected]>
---
controller/chassis.c | 6 ++++++
include/ovn/features.h | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/controller/chassis.c b/controller/chassis.c
index 118e60748..60c01eb24 100644
--- a/controller/chassis.c
+++ b/controller/chassis.c
@@ -408,7 +408,10 @@ chassis_build_other_config(const struct ovs_chassis_cfg
*ovs_cfg,
smap_replace(config, "ovn-evpn-local-ip", ovs_cfg->evpn_local_ip);
smap_replace(config, "is-interconn",
ovs_cfg->is_interconn ? "true" : "false");
+ smap_replace(config, OVN_FEATURE_PORT_UP_NOTIF, "true");
+ smap_replace(config, OVN_FEATURE_CT_NO_MASKED_LABEL, "true");
smap_replace(config, OVN_FEATURE_MAC_BINDING_TIMESTAMP, "true");
+ smap_replace(config, OVN_FEATURE_CT_LB_RELATED, "true");
smap_replace(config, OVN_FEATURE_FDB_TIMESTAMP, "true");
smap_replace(config, OVN_FEATURE_LS_DPG_COLUMN, "true");
smap_replace(config, OVN_FEATURE_CT_COMMIT_NAT_V2, "true");
@@ -742,7 +745,10 @@ update_supported_sset(struct sset *supported)
/* Internal options. */
sset_add(supported, "is-vtep");
sset_add(supported, "is-remote");
+ sset_add(supported, OVN_FEATURE_PORT_UP_NOTIF);
+ sset_add(supported, OVN_FEATURE_CT_NO_MASKED_LABEL);
sset_add(supported, OVN_FEATURE_MAC_BINDING_TIMESTAMP);
+ sset_add(supported, OVN_FEATURE_CT_LB_RELATED);
sset_add(supported, OVN_FEATURE_FDB_TIMESTAMP);
sset_add(supported, OVN_FEATURE_LS_DPG_COLUMN);
sset_add(supported, OVN_FEATURE_CT_COMMIT_NAT_V2);
diff --git a/include/ovn/features.h b/include/ovn/features.h
index d5828a7e5..3caeaea25 100644
--- a/include/ovn/features.h
+++ b/include/ovn/features.h
@@ -31,6 +31,12 @@
#define OVN_FEATURE_CT_LABEL_FLUSH "ct-label-flush"
#define OVN_FEATURE_CT_STATE_SAVE "ct-state-save"
+/* DEPRACATED: The following features can be removed
+ * after the next LTS version release. */
+#define OVN_FEATURE_PORT_UP_NOTIF "port-up-notif"
+#define OVN_FEATURE_CT_NO_MASKED_LABEL "ct-no-masked-label"
+#define OVN_FEATURE_CT_LB_RELATED "ovn-ct-lb-related"
+
/* OVS datapath supported features. Based on availability OVN might generate
* different types of openflows.
*/
--
2.51.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
