diff mbox series

[ovs-dev,v1,08/12] Move ofctrl-seqno module to lib.

Message ID 20250811101013.917962-1-numans@ovn.org
State Changes Requested
Headers show
Series OVN Bridge Controller service. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Numan Siddique Aug. 11, 2025, 10:10 a.m. UTC
From: Numan Siddique <numans@ovn.org>

Signed-off-by: Numan Siddique <numans@ovn.org>
---
 controller/automake.mk                  | 2 --
 controller/if-status.c                  | 2 +-
 controller/ovn-controller.c             | 2 +-
 lib/automake.mk                         | 2 ++
 {controller => lib}/ofctrl-seqno.c      | 0
 {controller => lib}/ofctrl-seqno.h      | 0
 {controller => lib}/test-ofctrl-seqno.c | 0
 tests/automake.mk                       | 3 +--
 8 files changed, 5 insertions(+), 6 deletions(-)
 rename {controller => lib}/ofctrl-seqno.c (100%)
 rename {controller => lib}/ofctrl-seqno.h (100%)
 rename {controller => lib}/test-ofctrl-seqno.c (100%)

Comments

Mark Michelson Aug. 21, 2025, 9:25 p.m. UTC | #1
Thanks Numan,

Acked-by: Mark Michelson <mmichels@redhat.com>

On 8/11/25 6:10 AM, numans@ovn.org wrote:
> From: Numan Siddique <numans@ovn.org>
> 
> Signed-off-by: Numan Siddique <numans@ovn.org>
> ---
>   controller/automake.mk                  | 2 --
>   controller/if-status.c                  | 2 +-
>   controller/ovn-controller.c             | 2 +-
>   lib/automake.mk                         | 2 ++
>   {controller => lib}/ofctrl-seqno.c      | 0
>   {controller => lib}/ofctrl-seqno.h      | 0
>   {controller => lib}/test-ofctrl-seqno.c | 0
>   tests/automake.mk                       | 3 +--
>   8 files changed, 5 insertions(+), 6 deletions(-)
>   rename {controller => lib}/ofctrl-seqno.c (100%)
>   rename {controller => lib}/ofctrl-seqno.h (100%)
>   rename {controller => lib}/test-ofctrl-seqno.c (100%)
> 
> diff --git a/controller/automake.mk b/controller/automake.mk
> index cbbca28dbd..e7c4618ebc 100644
> --- a/controller/automake.mk
> +++ b/controller/automake.mk
> @@ -26,8 +26,6 @@ controller_ovn_controller_SOURCES = \
>   	controller/lport.h \
>   	controller/ofctrl.c \
>   	controller/ofctrl.h \
> -	controller/ofctrl-seqno.c \
> -	controller/ofctrl-seqno.h \
>   	controller/pinctrl.c \
>   	controller/pinctrl.h \
>   	controller/patch.c \
> diff --git a/controller/if-status.c b/controller/if-status.c
> index 5b176b86da..ee9337e636 100644
> --- a/controller/if-status.c
> +++ b/controller/if-status.c
> @@ -17,7 +17,7 @@
>   
>   #include "binding.h"
>   #include "if-status.h"
> -#include "ofctrl-seqno.h"
> +#include "lib/ofctrl-seqno.h"
>   #include "ovsport.h"
>   #include "simap.h"
>   
> diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
> index 9cad2333ef..ffe546c63d 100644
> --- a/controller/ovn-controller.c
> +++ b/controller/ovn-controller.c
> @@ -48,7 +48,7 @@
>   #include "lport.h"
>   #include "memory.h"
>   #include "ofctrl.h"
> -#include "ofctrl-seqno.h"
> +#include "lib/ofctrl-seqno.h"
>   #include "openvswitch/vconn.h"
>   #include "openvswitch/vlog.h"
>   #include "ovn/actions.h"
> diff --git a/lib/automake.mk b/lib/automake.mk
> index 5e7720051c..3924c631cb 100644
> --- a/lib/automake.mk
> +++ b/lib/automake.mk
> @@ -37,6 +37,8 @@ lib_libovn_la_SOURCES = \
>   	lib/lex.c \
>   	lib/objdep.c \
>   	lib/objdep.h \
> +	lib/ofctrl-seqno.c \
> +	lib/ofctrl-seqno.h \
>   	lib/ovn-l7.h \
>   	lib/ovn-l7.c \
>   	lib/ovn-util.c \
> diff --git a/controller/ofctrl-seqno.c b/lib/ofctrl-seqno.c
> similarity index 100%
> rename from controller/ofctrl-seqno.c
> rename to lib/ofctrl-seqno.c
> diff --git a/controller/ofctrl-seqno.h b/lib/ofctrl-seqno.h
> similarity index 100%
> rename from controller/ofctrl-seqno.h
> rename to lib/ofctrl-seqno.h
> diff --git a/controller/test-ofctrl-seqno.c b/lib/test-ofctrl-seqno.c
> similarity index 100%
> rename from controller/test-ofctrl-seqno.c
> rename to lib/test-ofctrl-seqno.c
> diff --git a/tests/automake.mk b/tests/automake.mk
> index 06c768d2ee..e6a31c6f69 100644
> --- a/tests/automake.mk
> +++ b/tests/automake.mk
> @@ -286,10 +286,10 @@ tests_ovstest_SOURCES = \
>   	tests/test-ovn.c \
>   	tests/test-vector.c \
>   	controller/test-lflow-cache.c \
> -	controller/test-ofctrl-seqno.c \
>   	controller/test-vif-plug.c \
>   	lib/test-lflow-conj-ids.c \
>   	lib/test-ovn-features.c \
> +	lib/test-ofctrl-seqno.c \
>   	northd/test-ipam.c
>   
>   tests_ovstest_LDADD = $(OVS_LIBDIR)/daemon.lo \
> @@ -302,7 +302,6 @@ tests_ovstest_LDADD = $(OVS_LIBDIR)/daemon.lo \
>   	controller/lflow-cache.$(OBJEXT) \
>   	controller/local_data.$(OBJEXT) \
>   	controller/lport.$(OBJEXT) \
> -	controller/ofctrl-seqno.$(OBJEXT) \
>   	controller/ovsport.$(OBJEXT) \
>   	controller/patch.$(OBJEXT) \
>   	controller/route.$(OBJEXT) \
diff mbox series

Patch

diff --git a/controller/automake.mk b/controller/automake.mk
index cbbca28dbd..e7c4618ebc 100644
--- a/controller/automake.mk
+++ b/controller/automake.mk
@@ -26,8 +26,6 @@  controller_ovn_controller_SOURCES = \
 	controller/lport.h \
 	controller/ofctrl.c \
 	controller/ofctrl.h \
-	controller/ofctrl-seqno.c \
-	controller/ofctrl-seqno.h \
 	controller/pinctrl.c \
 	controller/pinctrl.h \
 	controller/patch.c \
diff --git a/controller/if-status.c b/controller/if-status.c
index 5b176b86da..ee9337e636 100644
--- a/controller/if-status.c
+++ b/controller/if-status.c
@@ -17,7 +17,7 @@ 
 
 #include "binding.h"
 #include "if-status.h"
-#include "ofctrl-seqno.h"
+#include "lib/ofctrl-seqno.h"
 #include "ovsport.h"
 #include "simap.h"
 
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
index 9cad2333ef..ffe546c63d 100644
--- a/controller/ovn-controller.c
+++ b/controller/ovn-controller.c
@@ -48,7 +48,7 @@ 
 #include "lport.h"
 #include "memory.h"
 #include "ofctrl.h"
-#include "ofctrl-seqno.h"
+#include "lib/ofctrl-seqno.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
 #include "ovn/actions.h"
diff --git a/lib/automake.mk b/lib/automake.mk
index 5e7720051c..3924c631cb 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -37,6 +37,8 @@  lib_libovn_la_SOURCES = \
 	lib/lex.c \
 	lib/objdep.c \
 	lib/objdep.h \
+	lib/ofctrl-seqno.c \
+	lib/ofctrl-seqno.h \
 	lib/ovn-l7.h \
 	lib/ovn-l7.c \
 	lib/ovn-util.c \
diff --git a/controller/ofctrl-seqno.c b/lib/ofctrl-seqno.c
similarity index 100%
rename from controller/ofctrl-seqno.c
rename to lib/ofctrl-seqno.c
diff --git a/controller/ofctrl-seqno.h b/lib/ofctrl-seqno.h
similarity index 100%
rename from controller/ofctrl-seqno.h
rename to lib/ofctrl-seqno.h
diff --git a/controller/test-ofctrl-seqno.c b/lib/test-ofctrl-seqno.c
similarity index 100%
rename from controller/test-ofctrl-seqno.c
rename to lib/test-ofctrl-seqno.c
diff --git a/tests/automake.mk b/tests/automake.mk
index 06c768d2ee..e6a31c6f69 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -286,10 +286,10 @@  tests_ovstest_SOURCES = \
 	tests/test-ovn.c \
 	tests/test-vector.c \
 	controller/test-lflow-cache.c \
-	controller/test-ofctrl-seqno.c \
 	controller/test-vif-plug.c \
 	lib/test-lflow-conj-ids.c \
 	lib/test-ovn-features.c \
+	lib/test-ofctrl-seqno.c \
 	northd/test-ipam.c
 
 tests_ovstest_LDADD = $(OVS_LIBDIR)/daemon.lo \
@@ -302,7 +302,6 @@  tests_ovstest_LDADD = $(OVS_LIBDIR)/daemon.lo \
 	controller/lflow-cache.$(OBJEXT) \
 	controller/local_data.$(OBJEXT) \
 	controller/lport.$(OBJEXT) \
-	controller/ofctrl-seqno.$(OBJEXT) \
 	controller/ovsport.$(OBJEXT) \
 	controller/patch.$(OBJEXT) \
 	controller/route.$(OBJEXT) \