Thanks Numan, Acked-by: Mark Michelson <mmich...@redhat.com>
On 8/11/25 6:09 AM, num...@ovn.org wrote:
From: Numan Siddique <num...@ovn.org> It will be used by ovn-br-controller. Signed-off-by: Numan Siddique <num...@ovn.org> --- controller/automake.mk | 2 -- controller/lflow.h | 2 +- controller/ovn-controller.c | 2 +- lib/automake.mk | 2 ++ {controller => lib}/lflow-conj-ids.c | 0 {controller => lib}/lflow-conj-ids.h | 2 +- {controller => lib}/test-lflow-conj-ids.c | 0 tests/automake.mk | 3 +-- 8 files changed, 6 insertions(+), 7 deletions(-) rename {controller => lib}/lflow-conj-ids.c (100%) rename {controller => lib}/lflow-conj-ids.h (98%) rename {controller => lib}/test-lflow-conj-ids.c (100%) diff --git a/controller/automake.mk b/controller/automake.mk index f0638ea97e..cbbca28dbd 100644 --- a/controller/automake.mk +++ b/controller/automake.mk @@ -22,8 +22,6 @@ controller_ovn_controller_SOURCES = \ controller/lflow.h \ controller/lflow-cache.c \ controller/lflow-cache.h \ - controller/lflow-conj-ids.c \ - controller/lflow-conj-ids.h \ controller/lport.c \ controller/lport.h \ controller/ofctrl.c \ diff --git a/controller/lflow.h b/controller/lflow.h index fa9e795e02..7722bbb430 100644 --- a/controller/lflow.h +++ b/controller/lflow.h @@ -38,7 +38,7 @@#include <stdint.h>#include "lflow-cache.h" -#include "lflow-conj-ids.h" +#include "lib/lflow-conj-ids.h" #include "openvswitch/hmap.h" #include "openvswitch/uuid.h" #include "openvswitch/list.h" diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 945952c5c4..9cad2333ef 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -41,7 +41,7 @@ #include "lb.h" #include "lflow.h" #include "lflow-cache.h" -#include "lflow-conj-ids.h" +#include "lib/lflow-conj-ids.h" #include "lib/vswitch-idl.h" #include "lib/ovsdb-types.h" #include "local_data.h" diff --git a/lib/automake.mk b/lib/automake.mk index 46c24e99d1..5e7720051c 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -26,6 +26,8 @@ lib_libovn_la_SOURCES = \ lib/ovn-parallel-hmap.c \ lib/ip-mcast-index.c \ lib/ip-mcast-index.h \ + lib/lflow-conj-ids.c \ + lib/lflow-conj-ids.h \ lib/mac-binding-index.c \ lib/mac-binding-index.h \ lib/mcast-group-index.c \ diff --git a/controller/lflow-conj-ids.c b/lib/lflow-conj-ids.c similarity index 100% rename from controller/lflow-conj-ids.c rename to lib/lflow-conj-ids.c diff --git a/controller/lflow-conj-ids.h b/lib/lflow-conj-ids.h similarity index 98% rename from controller/lflow-conj-ids.h rename to lib/lflow-conj-ids.h index 1ee8f7c3ea..81b549dfcd 100644 --- a/controller/lflow-conj-ids.h +++ b/lib/lflow-conj-ids.h @@ -47,4 +47,4 @@ void lflow_conj_ids_clear(struct conj_ids *); void lflow_conj_ids_dump(struct conj_ids *, struct ds *out_data); void lflow_conj_ids_set_test_mode(bool);-#endif /* controller/lflow-conj-ids.h */+#endif /* lib/lflow-conj-ids.h */ diff --git a/controller/test-lflow-conj-ids.c b/lib/test-lflow-conj-ids.c similarity index 100% rename from controller/test-lflow-conj-ids.c rename to lib/test-lflow-conj-ids.c diff --git a/tests/automake.mk b/tests/automake.mk index b96932dc21..06c768d2ee 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -286,9 +286,9 @@ tests_ovstest_SOURCES = \ tests/test-ovn.c \ tests/test-vector.c \ controller/test-lflow-cache.c \ - controller/test-lflow-conj-ids.c \ controller/test-ofctrl-seqno.c \ controller/test-vif-plug.c \ + lib/test-lflow-conj-ids.c \ lib/test-ovn-features.c \ northd/test-ipam.c@@ -300,7 +300,6 @@ tests_ovstest_LDADD = $(OVS_LIBDIR)/daemon.lo \controller/ha-chassis.$(OBJEXT) \ controller/if-status.$(OBJEXT) \ controller/lflow-cache.$(OBJEXT) \ - controller/lflow-conj-ids.$(OBJEXT) \ controller/local_data.$(OBJEXT) \ controller/lport.$(OBJEXT) \ controller/ofctrl-seqno.$(OBJEXT) \
_______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
