On 12/19/24 11:53, Frode Nordahl wrote:
> The ovs-flowviz executable Python script is expected to be
> executed by the end user.
> 
> Surveying where current executable binaries are installed for the
> package, the placement of ovs-flowviz in python3-openvswitch
> is unexpected to me, other client binaries are shipped inside the
> openvswitch-common package.
> 
> To me, the python3-openvswitch package represents a library
> dependency, which you would install to get the Python ovs module
> for your Python application to consume.
> 
> This is also the current choice of placement for the downstream
> Debian / Ubuntu package [0].
> 
> Consequently this patch proposes to move ovs-flowviz and its
> manual page to openvswitch-common.
> 
> The Python dependencies are added as recommended dependencies,
> which will retain good interactive UX, and at the same time allow
> non-interactive users to opt out.
> 
> 0: 
> https://salsa.debian.org/openstack-team/third-party/openvswitch/-/commit/353e3d71cc99193151ac21a9a7779217476c4b5c
> Signed-off-by: Frode Nordahl <[email protected]>
> ---
>  debian/control.in                  | 6 ++++--
>  debian/openvswitch-common.install  | 2 ++
>  debian/python3-openvswitch.install | 3 ---
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/debian/control.in b/debian/control.in
> index 958eec3a2..42dc5f19a 100644
> --- a/debian/control.in
> +++ b/debian/control.in
> @@ -47,6 +47,7 @@ Depends:
>   ${misc:Depends},
>   ${shlibs:Depends},
>  Recommends:
> + python3-openvswitch (= ${binary:Version}),
>   ${python3:Depends},
>  Suggests:
>   ethtool,
> @@ -285,11 +286,12 @@ Depends:
>   ${misc:Depends},
>   ${python3:Depends},
>   ${shlibs:Depends},
> -Suggests:
> +Recommends:
>   python3-click,
> - python3-graphviz,
>   python3-netaddr,
>   python3-pyparsing,
> +Suggests:
> + python3-graphviz,
>   python3-rich,

I think, we need to recommend the rich as well.  It's a small package
and ovs-flowviz will not really work without it.

>   python3-unbound,
>  Description: Python 3 bindings for Open vSwitch
> diff --git a/debian/openvswitch-common.install 
> b/debian/openvswitch-common.install
> index 9bdb43a6f..5fef8de74 100644
> --- a/debian/openvswitch-common.install
> +++ b/debian/openvswitch-common.install
> @@ -1,6 +1,7 @@
>  etc/bash_completion.d/ovs-appctl-bashcomp.bash 
> usr/share/bash-completion/completions
>  usr/bin/ovs-appctl
>  usr/bin/ovs-docker
> +usr/bin/ovs-flowviz
>  usr/bin/ovs-ofctl
>  usr/bin/ovs-parse-backtrace
>  usr/bin/ovs-pki
> @@ -20,6 +21,7 @@ usr/share/man/man7/ovsdb-server.7
>  usr/share/man/man7/ovsdb.7
>  usr/share/man/man8/ovs-appctl.8
>  usr/share/man/man8/ovs-bugtool.8
> +usr/share/man/man8/ovs-flowviz.8
>  usr/share/man/man8/ovs-ofctl.8
>  usr/share/man/man8/ovs-parse-backtrace.8
>  usr/share/man/man8/ovs-pki.8
> diff --git a/debian/python3-openvswitch.install 
> b/debian/python3-openvswitch.install
> index 0c1b34351..cd1dae3af 100644
> --- a/debian/python3-openvswitch.install
> +++ b/debian/python3-openvswitch.install
> @@ -4,6 +4,3 @@
>  # dh_python will consolidate into usr/lib/python3/dist-packages retaining
>  # version specific shared object files.
>  usr/lib/python3* usr/lib/
> -
> -usr/bin/ovs-flowviz
> -usr/share/man/man8/ovs-flowviz.8

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to