| Message ID | 20250319130323.382077-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] treewide: Use ovn-appctl instead of ovs-appctl where applicable. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On Wed, Mar 19, 2025 at 2:03 PM Dumitru Ceara via dev < ovs-dev@openvswitch.org> wrote: > This changes all relevant places in the documentation, tests, scripts to > use ovn-appctl when targeting OVN daemons. While using ovs-appctl is > not necessarily wrong (they're mostly equivalent except for the default > paths that are searched ovn_rundir() vs ovs_rundir()) it often confuses > users. > > Reported-at: > https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5132#discussion_r2003138389 > Signed-off-by > <https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5132#discussion_r2003138389Signed-off-by>: > Dumitru Ceara <dceara@redhat.com> > --- > Documentation/internals/security.rst | 2 +- > controller/ovn-controller.8.xml | 4 +- > ic/ovn-ic.8.xml | 2 +- > northd/ovn-northd.8.xml | 2 +- > ovn-sb.xml | 2 +- > rhel/etc_logrotate.d_ovn | 2 +- > tests/ovn-ic.at | 2 +- > tests/ovn-macros.at | 2 +- > tests/ovn-northd.at | 12 +-- > tests/ovn-performance.at | 2 +- > tests/ovn.at | 108 +++++++++++++-------------- > utilities/ovn-appctl.8.xml | 2 +- > utilities/ovn-lib.in | 10 +-- > utilities/ovn-trace.8.xml | 2 +- > 14 files changed, 77 insertions(+), 77 deletions(-) > > diff --git a/Documentation/internals/security.rst > b/Documentation/internals/security.rst > index c1fa2d8387..fe76406045 100644 > --- a/Documentation/internals/security.rst > +++ b/Documentation/internals/security.rst > @@ -171,7 +171,7 @@ sections for the document include: > > Given a choice, the procedure should be one that takes at least > some work to turn into a useful exploit. For example, a > - procedure based on "ovs-appctl" commands, which require local > + procedure based on "ovn-appctl" commands, which require local > administrator access, is preferred to one that sends test > packets to a machine, which only requires network connectivity. > > diff --git a/controller/ovn-controller.8.xml > b/controller/ovn-controller.8.xml > index eace2c5cf2..76e8a0db59 100644 > --- a/controller/ovn-controller.8.xml > +++ b/controller/ovn-controller.8.xml > @@ -672,7 +672,7 @@ > <dd> > Upon startup, <code>ovn-controller</code> creates a row in this > table > to represent its own chassis. Upon graceful termination, e.g. > with > - <code>ovs-appctl -t ovn-controller exit</code> (but not > + <code>ovn-appctl -t ovn-controller exit</code> (but not > <code>SIGTERM</code>), <code>ovn-controller</code> removes its > row. > </dd> > > @@ -708,7 +708,7 @@ > > <h1>Runtime Management Commands</h1> > <p> > - <code>ovs-appctl</code> can send commands to a running > + <code>ovn-appctl</code> can send commands to a running > <code>ovn-controller</code> process. The currently supported > commands are described below. > <dl> > diff --git a/ic/ovn-ic.8.xml b/ic/ovn-ic.8.xml > index 2f211a25f5..2153a4a17a 100644 > --- a/ic/ovn-ic.8.xml > +++ b/ic/ovn-ic.8.xml > @@ -72,7 +72,7 @@ > > <h1>Runtime Management Commands</h1> > <p> > - <code>ovs-appctl</code> can send commands to a running > + <code>ovn-appctl</code> can send commands to a running > <code>ovn-ic</code> process. The currently supported commands > are described below. > <dl> > diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml > index 155ba8a491..cd80e9a25b 100644 > --- a/northd/ovn-northd.8.xml > +++ b/northd/ovn-northd.8.xml > @@ -90,7 +90,7 @@ > > <h1>Runtime Management Commands</h1> > <p> > - <code>ovs-appctl</code> can send commands to a running > + <code>ovn-appctl</code> can send commands to a running > <code>ovn-northd</code> process. The currently supported commands > are described below. > <dl> > diff --git a/ovn-sb.xml b/ovn-sb.xml > index 39acb81a41..875200d7a5 100644 > --- a/ovn-sb.xml > +++ b/ovn-sb.xml > @@ -2293,7 +2293,7 @@ > that processes it. Packet logging currently uses the same > logging > mechanism as other Open vSwitch and OVN messages, which means > that > whether and where log messages appear depends on the local > logging > - configuration that can be configured with > <code>ovs-appctl</code>, > + configuration that can be configured with > <code>ovn-appctl</code>, > etc. > </p> > <p> > diff --git a/rhel/etc_logrotate.d_ovn b/rhel/etc_logrotate.d_ovn > index a351ec3038..a62ba91ea8 100644 > --- a/rhel/etc_logrotate.d_ovn > +++ b/rhel/etc_logrotate.d_ovn > @@ -15,7 +15,7 @@ > # Tell OVN daemons to reopen their log files > if [ -d /var/run/ovn ]; then > for ctl in /var/run/ovn/*.ctl; do > - ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || : > + ovn-appctl -t "$ctl" vlog/reopen 2>/dev/null || : > done > fi > endscript > diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at > index e62ae3a350..0f823b91e7 100644 > --- a/tests/ovn-ic.at > +++ b/tests/ovn-ic.at > @@ -1704,7 +1704,7 @@ for s_az in $(seq 1 $n_az); do > udp && udp.src==53 && udp.dst==4369" > echo "sending: $packet" > AT_CHECK([ovn_trace --ovs "$packet" > > ${s_az}-${d_az}-$i.ovn-trace]) > - OVS_WAIT_UNTIL([ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > ovs_inport=$(ovs-vsctl --bare --columns=ofport find Interface > external-ids:iface-id="$ovn_inport") > > ovs_packet=$(echo $packet | ovstest test-ovn expr-to-packets) > diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at > index 16b77cf018..fd1a6b197a 100644 > --- a/tests/ovn-macros.at > +++ b/tests/ovn-macros.at > @@ -1273,7 +1273,7 @@ ovn_trace() { > ovn_trace_client() { > target=$1; shift > AT_CAPTURE_FILE([trace]) > - ovs-appctl -t $target trace "$@" | tee trace | sed '/^# /d' > + ovn-appctl -t $target trace "$@" | tee trace | sed '/^# /d' > } > > # Receives a string with scapy python code that represents a packet. > diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at > index 419130aa89..9dece913a8 100644 > --- a/tests/ovn-northd.at > +++ b/tests/ovn-northd.at > @@ -462,7 +462,7 @@ check ovn-nbctl --wait=sb lsp-add sw p1 > check_row_count Port_Binding 1 logical_port=p1 > AT_CHECK([ovn-nbctl --wait=sb lsp-del p1]) > > -# ovs-appctl exit with unixctl option > +# ovn-appctl exit with unixctl option > OVS_APP_EXIT_AND_WAIT_BY_TARGET(["$ovs_base"/northd/ovn-northd.ctl], > ["$ovs_base"/northd/ovn-northd.pid]) > > # Check no port_binding entry for new port as ovn-northd is not running > @@ -868,7 +868,7 @@ Status: paused > ]) > > AS_BOX([Resume the backup]) > -check as northd-backup ovs-appctl -t ovn-northd resume > +check as northd-backup ovn-appctl -t ovn-northd resume > OVS_WAIT_FOR_OUTPUT([get_northd_status], [0], [false > Status: active > false > @@ -885,8 +885,8 @@ check ovn-nbctl --wait=sb ls-del sw0 > check_row_count Datapath_Binding 0 > > AS_BOX([Pause the main northd]) > -check as northd ovs-appctl -t ovn-northd pause > -check as northd-backup ovs-appctl -t ovn-northd pause > +check as northd ovn-appctl -t ovn-northd pause > +check as northd-backup ovn-appctl -t ovn-northd pause > AT_CHECK([get_northd_status], [0], [true > Status: paused > true > @@ -902,7 +902,7 @@ check_row_count Datapath_Binding 0 > # Do not resume both main and backup right after each other > # as there would be no guarentee of which one would become active > AS_BOX([Resume the main northd]) > -check as northd ovs-appctl -t ovn-northd resume > +check as northd ovn-appctl -t ovn-northd resume > OVS_WAIT_FOR_OUTPUT([get_northd_status], [0], [false > Status: active > true > @@ -910,7 +910,7 @@ Status: paused > ]) > > AS_BOX([Resume the backup northd]) > -check as northd-backup ovs-appctl -t ovn-northd resume > +check as northd-backup ovn-appctl -t ovn-northd resume > OVS_WAIT_FOR_OUTPUT([get_northd_status], [0], [false > Status: active > false > diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at > index 7d480c20c8..44bd4f7e4f 100644 > --- a/tests/ovn-performance.at > +++ b/tests/ovn-performance.at > @@ -100,7 +100,7 @@ read_counters() { > local sims="$1" target="$2" counter="$3" > > for sim in $sims; do > - as $sim ovs-appctl -t "$target" coverage/read-counter "$counter" > || return 1 > + as $sim ovn-appctl -t "$target" coverage/read-counter "$counter" > || return 1 > done > } > > diff --git a/tests/ovn.at b/tests/ovn.at > index afde2576f2..822f799821 100644 > --- a/tests/ovn.at > +++ b/tests/ovn.at > @@ -3079,7 +3079,7 @@ done > > # send packets for unknown datapath > AT_CAPTURE_FILE([trace]) > -AT_CHECK_UNQUOTED([ovs-appctl -t ovn-trace trace --all lsw100 "inport == > p100 && ip4.dst == 10.96.57.175"], [0], [dnl > +AT_CHECK_UNQUOTED([ovn-appctl -t ovn-trace trace --all lsw100 "inport == > p100 && ip4.dst == 10.96.57.175"], [0], [dnl > unknown datapath "lsw100" > ]) > > @@ -6029,7 +6029,7 @@ check ovn-nbctl --wait=hv sync > packet="inport==\"ls1-lp1\" && eth.src==$ls1_lp1_mac && > eth.dst==$rp_ls1_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_lp1_ip && ip4.dst==$ls2_lp1_ip > && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > > echo "---------NB dump-----" > @@ -6079,7 +6079,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_lp1_mac > && eth.dst==$rp_ls1_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_lp1_ip && ip4.dst==$ls2_lp1_ip > && > udp && udp.src==53 && udp.dst==4369" > > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > # The 2nd packet sent shound not be received. > OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) > > @@ -8585,7 +8585,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac > && eth.dst==$ls1_ro_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the drop policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8609,7 +8609,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | > grep "192.168.1.0" -c], [0] > packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && > eth.dst==$ls1_ro_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the allow policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8638,7 +8638,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | > \ > packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && > eth.dst==$ls1_ro_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the allow policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8680,7 +8680,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac > && eth.dst==$ls1_ro_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the drop policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8705,7 +8705,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | > grep "192.168.1.0" -c], [0] > packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && > eth.dst==$ls1_ro_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the allow policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8733,7 +8733,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | > \ > packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && > eth.dst==$ls1_ro_mac && > ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the allow policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8851,7 +8851,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac > && eth.dst==$ls1_ro_mac && > ip6 && ip.ttl==64 && ip6.src==$ls1_p1_ip && ip6.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the drop policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8874,7 +8874,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | > grep -F "2001" -c], [0], [d > packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && > eth.dst==$ls1_ro_mac && > ip6 && ip.ttl==64 && ip6.src==$ls1_p1_ip && ip6.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the allow policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -8903,7 +8903,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | > \ > packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && > eth.dst==$ls1_ro_mac && > ip6 && ip.ttl==64 && ip6.src==$ls1_p1_ip && ip6.dst==$ls2_p1_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Check if packet hit the allow policy > OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ > @@ -9107,7 +9107,7 @@ check ovn-nbctl --wait=hv destroy Address_Set $row > # was updated and then removed. This test case ensures > # that ovn-controller is at least still running after > # creating, updating, and deleting an address set. > -AT_CHECK([ovs-appctl -t ovn-controller version], [0], [ignore]) > +AT_CHECK([ovn-appctl -t ovn-controller version], [0], [ignore]) > > OVN_CLEANUP([hv1]) > > @@ -10439,73 +10439,73 @@ AT_CAPTURE_FILE([sbflows]) > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4360 && tcp.dst==80" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be dropped with logging in the ingress pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4361 && tcp.dst==81" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be dropped without logging in the eggress > pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4360 && tcp.dst==180" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be dropped with logging in the egress pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4361 && tcp.dst==181" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be allowed without logging. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4362 && tcp.dst==82" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be allowed with logging. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4363 && tcp.dst==83" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should allow related flows without logging. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4364 && tcp.dst==84" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should allow related flows with logging. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4365 && tcp.dst==85" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be rejected without logging in the ingress > pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4366 && tcp.dst==86" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be rejected with logging in the ingress > pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4367 && tcp.dst==87" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be rejected without logging in the egress > pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4366 && tcp.dst==186" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Send packet that should be rejected with logging in the egress pipeline. > packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && > ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && > tcp && tcp.flags==2 && tcp.src==4367 && tcp.dst==187" > -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > OVS_WAIT_UNTIL([ test 8 = $(grep -c 'acl_log' hv/ovn-controller.log) ]) > > @@ -10599,7 +10599,7 @@ echo "Meter duration: $d_secs" > AT_SKIP_IF([test $d_secs -gt 9]) > > # Print some information that may help debugging. > -AT_CHECK([as hv ovs-appctl -t ovn-controller meter-table-list], [0], [dnl > +AT_CHECK([as hv ovn-appctl -t ovn-controller meter-table-list], [0], [dnl > http-rl1: 1 > http-rl2: 2 > ]) > @@ -18399,7 +18399,7 @@ mirror-to-lp2 > # Send a packet from lp1 to lp2, should be mirrored to both mirror ports. > packet="inport==\"ls1-lp1\" && eth.src==00:00:00:01:01:02 && > eth.dst==00:00:00:01:01:03 && > ip4 && ip.ttl==64 && ip4.src==10.0.0.2 && ip4.dst==10.0.0.3 && > icmp" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > exp_packet="eth.src==00:00:00:01:01:02 && eth.dst==00:00:00:01:01:03 && > ip4 && > ip.ttl==64 && ip4.src==10.0.0.2 && ip4.dst==10.0.0.3 && icmp" > @@ -19100,7 +19100,7 @@ test_icmp() { > icmp4.code==0" > shift; shift; shift; shift; shift; shift > hv=hv`vif_to_hv $inport` > - OVS_WAIT_UNTIL([as $hv ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([as $hv ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > in_ls=`vif_to_ls $inport` > in_lrp=`vif_to_lrp $inport` > for outport; do > @@ -20253,7 +20253,7 @@ for i in 1 2; do > options:rxq_pcap=hv$i/vif$i-rx.pcap \ > ofport-request=$i > > - ovs-appctl -t ovn-controller vlog/set file:dbg:pinctrl > + ovn-appctl -t ovn-controller vlog/set file:dbg:pinctrl > done > > check ovn-nbctl lr-add lr0 > @@ -20579,7 +20579,7 @@ packet="inport==\"sw1-p1\" && eth.src==$sw1_p1_mac > && eth.dst==$sw1_ro_mac && > udp && udp.src==53 && udp.dst==4369" > > # Start by Sending the packet and make sure it makes it there as expected > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Expected packet has TTL decreased by 1 > expected="eth.src==$sw2_ro_mac && eth.dst==$sw2_p1_mac && > @@ -20590,10 +20590,10 @@ echo $expected | ovstest test-ovn > expr-to-packets > expected > OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) > > # Stop ovn-controller on hv2 > -as hv2 ovs-appctl -t ovn-controller exit > +as hv2 ovn-appctl -t ovn-controller exit > > # Now send the packet again. This time, it should not arrive. > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) > > @@ -21456,7 +21456,7 @@ packet="inport==\"sw1-p1\" && eth.src==$sw1_p1_mac > && eth.dst==$sw1_ro_mac && > udp && udp.src==53 && udp.dst==4369" > > # Start by Sending the packet and make sure it makes it there as expected > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Expected packet has TTL decreased by 1 > expected="eth.src==$sw2_ro_mac && eth.dst==$sw2_p1_mac && > @@ -21470,7 +21470,7 @@ OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) > OVN_CONTROLLER_EXIT([hv2]) > > # Now send the packet again. This time, it should still arrive > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > cat expected expected > expected2 > > @@ -22766,7 +22766,7 @@ ovs-vsctl -- add-port br-int hv1-vif3 -- \ > options:rxq_pcap=hv1/vif3-rx.pcap \ > ofport-request=3 > > -ovs-appctl -t ovn-controller vlog/set dbg > +ovn-appctl -t ovn-controller vlog/set dbg > > sim_add hv2 > as hv2 > @@ -23379,7 +23379,7 @@ AT_CAPTURE_FILE([offlows]) > packet0="inport==\"sw0-p11\" && eth.src==00:00:00:00:00:11 && > eth.dst==00:00:00:00:00:21 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && > ip4.dst==192.168.1.100 && > tcp && tcp.src==10000 && tcp.dst==80" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet0"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet0"]) > > wait_row_count controller_event 1 > ovn-sbctl list controller_event > events > @@ -23408,7 +23408,7 @@ packet1="inport==\"sw1-p0\" && > eth.src==00:00:00:00:00:33 && eth.dst==00:00:00:0 > ip4 && ip.ttl==64 && ip4.src==192.168.2.11 && > ip4.dst==192.168.2.100 && > tcp && tcp.src==10000 && tcp.dst==80" > > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet1"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet1"]) > wait_row_count controller_event 1 > ovn-sbctl list controller_event > uuid=$(ovn-sbctl list controller_event | awk '/_uuid/{print $3}') > @@ -23424,7 +23424,7 @@ packet2="inport==\"sw0-p11\" && > eth.src==00:00:00:00:00:11 && eth.dst==00:00:00: > ip6 && ip.ttl==64 && ip6.src==2001::11 && ip6.dst==2001::10 && > tcp && tcp.src==10000 && tcp.dst==50051" > > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet2"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet2"]) > wait_row_count controller_event 1 > ovn-sbctl list controller_event > uuid=$(ovn-sbctl list controller_event | awk '/_uuid/{print $3}') > @@ -25621,7 +25621,7 @@ check ovn-nbctl --wait=hv sync > # Get the OF table numbers > learn_neigh=$(ovn-debug lflow-stage-to-oftable lr_in_learn_neighbor) > > -as hv1 ovs-appctl -t ovn-controller vlog/set dbg > +as hv1 ovn-appctl -t ovn-controller vlog/set dbg > > # From sw0-p1 send GARP for 10.0.0.30. > # ovn-controller should learn the > @@ -27355,7 +27355,7 @@ for i in $(seq 5001 5010); do > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && > ip4.dst==10.0.0.123 && > tcp && tcp.src==$i && tcp.dst==80" > - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > for j in 1 2; do > # Assume all packets go to lsp2${j}. > @@ -27497,7 +27497,7 @@ for i in $(seq 5001 5010); do > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && > ip4.dst==10.0.0.100 && > tcp && tcp.src==$i && tcp.dst==80" > - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > for j in 1 2; do > # Assume all packets go to lsp2${j}. > @@ -27577,7 +27577,7 @@ for i in $(seq 5001 5010); do > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && > ip4.dst==10.0.0.100 && > tcp && tcp.src==$i && tcp.dst==80" > - OVS_WAIT_UNTIL([as hv2 ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([as hv2 ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > for j in 1 2; do > # Assume all packets go to lsp2${j}. > @@ -27704,7 +27704,7 @@ wait_for_ports_up > # Test 1 > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==2.2.2.2 && > icmp" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Assume no packets go neither to lsp21 nor to lsp22. > > expected_lsp21 > @@ -27734,7 +27734,7 @@ done > # Test 2 > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==1.1.1.1 && > icmp" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Assume all packets go to lsp22. > exp_packet="eth.src==00:00:00:01:02:01 && eth.dst==f0:00:00:00:02:22 && > @@ -27764,7 +27764,7 @@ done > # Test 3 > packet="inport==\"lsp21\" && eth.src==f0:00:00:00:02:21 && > eth.dst==00:00:00:01:02:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.2.21 && ip4.dst==2.2.2.2 && > icmp" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Assume all packets go to lsp21. > exp_packet="eth.src==00:00:00:01:02:01 && eth.dst==f0:00:00:00:02:21 && > @@ -27861,7 +27861,7 @@ wait_for_ports_up > # test 1 > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && > ip4.dst==192.168.2.21 && icmp" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Assume all packets go to lsp21. > exp_packet="eth.src==00:00:00:01:02:01 && eth.dst==f0:00:00:00:02:21 && > ip4 && > @@ -27895,7 +27895,7 @@ ovs-vsctl set interface hv1-vif2 > options:tx_pcap=hv1/vif2-tx.pcap > # test 2 > packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && > eth.dst==00:00:00:01:01:01 && > ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && > ip4.dst==192.168.2.200 && icmp" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Assume all packets go to lsp11. > exp_packet="eth.src==00:00:00:01:01:01 && eth.dst==f0:00:00:00:01:11 && > ip4 && > @@ -28000,7 +28000,7 @@ for i in $(seq 1 2); do > packet="inport==\"lsp${i}1\" && eth.src==f0:00:00:00:0${i}:1${i} && > eth.dst==00:00:00:01:0${i}:01 && ip4 && ip.ttl==64 && > ip4.src==192.168.${i}.${i}1 && ip4.dst==10.0.0.1 && icmp" > - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Assume all packets go to lsp${di}1. > exp_packet="eth.src==00:00:00:01:0${di}:01 && > eth.dst==f0:00:00:00:0${di}:1${di} && > @@ -28115,7 +28115,7 @@ for i in $(seq 1 2); do > packet="inport==\"lsp${i}1\" && eth.src==f0:00:00:00:0${i}:1${i} && > eth.dst==00:00:00:01:0${i}:01 && ip6 && ip.ttl==64 && > ip6.src==2001:db8:${i}::${i}1 && ip6.dst==2001:db8:2000::1 && > icmp6" > - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt > "$packet"]) > + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt > "$packet"]) > > # Assume all packets go to lsp${di}1. > exp_packet="eth.src==00:00:00:01:0${di}:01 && > eth.dst==f0:00:00:00:0${di}:1${di} && ip6 && > @@ -28242,7 +28242,7 @@ dst_ip=172.16.1.11 > packet="inport==\"lsp11\" && eth.src==$src_mac && eth.dst==$dst_mac && > ip4 && ip.ttl==64 && ip4.src==$src_ip && ip4.dst==$dst_ip && > udp && udp.src==53 && udp.dst==4369" > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Check if the packet hit the forwarding group policy > AT_CAPTURE_FILE([offlows2]) > @@ -33837,7 +33837,7 @@ packet="inport==\"sw1-lp1\" && > eth.src==00:00:04:01:02:03 && > ip4.src==10.0.0.100 && ip4.dst==20.0.0.200 && > udp && udp.src==53 && udp.dst==4369" > > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Check if packet hit the drop rule > AT_CHECK([ovs-ofctl dump-flows br-int | grep "nw_dst=20.0.0.0/24" | \ > @@ -33864,7 +33864,7 @@ packet="inport==\"sw1-lp1\" && > eth.src==00:00:04:01:02:03 && > ip4.src==10.0.0.100 && ip4.dst==20.0.0.200 && > udp && udp.src==53 && udp.dst==4369" > > -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) > +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) > > # Check if packet hit the drop rule > AT_CHECK([ovs-ofctl dump-flows br-int "nw_src=10.0.0.0/24" | \ > @@ -36624,7 +36624,7 @@ ovs-vsctl --no-wait -- add-port br-int vif2 \ > > # Check that ovn-controller handled the bindings > OVS_WAIT_UNTIL( > - [test `ovs-appctl -t ovn-controller debug/dump-local-bindings | grep > interface | wc -l` -eq 2], > + [test `ovn-appctl -t ovn-controller debug/dump-local-bindings | grep > interface | wc -l` -eq 2], > [kill -CONT $(cat ovn-sb/ovsdb-server.pid)] > ) > AT_CHECK([kill -CONT $(cat ovn-sb/ovsdb-server.pid)]) > @@ -39149,7 +39149,7 @@ ovs-vsctl -- add-port br-int hv1-vif3 -- \ > options:rxq_pcap=hv1/vif3-rx.pcap \ > ofport-request=3 > > -ovs-appctl -t ovn-controller vlog/set dbg > +ovn-appctl -t ovn-controller vlog/set dbg > > check ovn-nbctl ls-add sw0 > > diff --git a/utilities/ovn-appctl.8.xml b/utilities/ovn-appctl.8.xml > index a790e52bb5..e3d024da17 100644 > --- a/utilities/ovn-appctl.8.xml > +++ b/utilities/ovn-appctl.8.xml > @@ -28,7 +28,7 @@ > </p> > > <p> > - <code>ovn-ctl</code> is exactly similar to Open vSwitch > + <code>ovn-appctl</code> is the equivalent of the Open vSwitch > <code>ovs-appctl</code> utility. > </p> > > diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in > index 65cbfbcdcd..151af6885b 100644 > --- a/utilities/ovn-lib.in > +++ b/utilities/ovn-lib.in > @@ -163,13 +163,13 @@ stop_ovn_daemon () { > actions="TERM .1 .25 .65 1 1 1 1 \ > KILL 1 1 1 2 10 15 30 \ > FAIL" > - version=`ovs-appctl -T 1 -t $ctl_file version \ > + version=`ovn-appctl -T 1 -t $ctl_file version \ > | awk 'NR==1{print $NF}'` > > - # Use `ovs-appctl exit` only if the running daemon version > + # Use `ovn-appctl exit` only if the running daemon version > # is >= 2.5.90. This script might be used during upgrade to > # stop older versions of daemons which do not behave correctly > - # with `ovs-appctl exit` (e.g. ovs-vswitchd <= 2.5.0 deletes > + # with `ovn-appctl exit` (e.g. ovs-vswitchd <= 2.5.0 deletes > # internal ports). > if version_geq "$version" "2.5.90"; then > actions="$graceful $actions" > @@ -182,7 +182,7 @@ stop_ovn_daemon () { > return 0 > fi > # But, does the file exist? We may have had a daemon > - # segfault with `ovs-appctl exit`. Check one more time > + # segfault with `ovn-appctl exit`. Check one more time > # before deciding that the daemon is dead. > [ -e "$pid_file" ] && sleep 2 && pid=`cat > "$pid_file"` 2>/dev/null > if pid_exists "$pid" >/dev/null 2>&1; then :; else > @@ -192,7 +192,7 @@ stop_ovn_daemon () { > case $action in > EXIT) > action "Exiting $1 ($pid)" \ > - ${bindir}/ovs-appctl -T 1 -t $ctl_file exit > $other_args > + ${bindir}/ovn-appctl -T 1 -t $ctl_file exit > $other_args > # The above command could have resulted in delayed > # daemon segfault. And if a monitor is running, it > # would restart the daemon giving it a new pid. > diff --git a/utilities/ovn-trace.8.xml b/utilities/ovn-trace.8.xml > index be82bf2712..d017a943ed 100644 > --- a/utilities/ovn-trace.8.xml > +++ b/utilities/ovn-trace.8.xml > @@ -281,7 +281,7 @@ > <p> > If <code>ovn-trace</code> is invoked with the <code>--detach</code> > option > (see <code>Daemon Options</code>, below), it runs in the background > as a > - daemon and accepts commands from <code>ovs-appctl</code> (or another > + daemon and accepts commands from <code>ovn-appctl</code> (or another > JSON-RPC client) indefinitely. The currently supported commands are > described below. > </p> > -- > 2.48.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > Looks good to me, thanks. Acked-by: Ales Musil <amusil@redhat.com>
On 4/3/25 10:17 AM, Ales Musil wrote: > On Wed, Mar 19, 2025 at 2:03 PM Dumitru Ceara via dev < > ovs-dev@openvswitch.org> wrote: > >> This changes all relevant places in the documentation, tests, scripts to >> use ovn-appctl when targeting OVN daemons. While using ovs-appctl is >> not necessarily wrong (they're mostly equivalent except for the default >> paths that are searched ovn_rundir() vs ovs_rundir()) it often confuses >> users. >> >> Reported-at: >> https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5132#discussion_r2003138389 >> Signed-off-by >> <https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5132#discussion_r2003138389Signed-off-by>: >> Dumitru Ceara <dceara@redhat.com> >> --- > Looks good to me, thanks. > > Acked-by: Ales Musil <amusil@redhat.com> > Hi Ales, Thanks for the review! Applied to main. Regards, Dumitru
diff --git a/Documentation/internals/security.rst b/Documentation/internals/security.rst index c1fa2d8387..fe76406045 100644 --- a/Documentation/internals/security.rst +++ b/Documentation/internals/security.rst @@ -171,7 +171,7 @@ sections for the document include: Given a choice, the procedure should be one that takes at least some work to turn into a useful exploit. For example, a - procedure based on "ovs-appctl" commands, which require local + procedure based on "ovn-appctl" commands, which require local administrator access, is preferred to one that sends test packets to a machine, which only requires network connectivity. diff --git a/controller/ovn-controller.8.xml b/controller/ovn-controller.8.xml index eace2c5cf2..76e8a0db59 100644 --- a/controller/ovn-controller.8.xml +++ b/controller/ovn-controller.8.xml @@ -672,7 +672,7 @@ <dd> Upon startup, <code>ovn-controller</code> creates a row in this table to represent its own chassis. Upon graceful termination, e.g. with - <code>ovs-appctl -t ovn-controller exit</code> (but not + <code>ovn-appctl -t ovn-controller exit</code> (but not <code>SIGTERM</code>), <code>ovn-controller</code> removes its row. </dd> @@ -708,7 +708,7 @@ <h1>Runtime Management Commands</h1> <p> - <code>ovs-appctl</code> can send commands to a running + <code>ovn-appctl</code> can send commands to a running <code>ovn-controller</code> process. The currently supported commands are described below. <dl> diff --git a/ic/ovn-ic.8.xml b/ic/ovn-ic.8.xml index 2f211a25f5..2153a4a17a 100644 --- a/ic/ovn-ic.8.xml +++ b/ic/ovn-ic.8.xml @@ -72,7 +72,7 @@ <h1>Runtime Management Commands</h1> <p> - <code>ovs-appctl</code> can send commands to a running + <code>ovn-appctl</code> can send commands to a running <code>ovn-ic</code> process. The currently supported commands are described below. <dl> diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml index 155ba8a491..cd80e9a25b 100644 --- a/northd/ovn-northd.8.xml +++ b/northd/ovn-northd.8.xml @@ -90,7 +90,7 @@ <h1>Runtime Management Commands</h1> <p> - <code>ovs-appctl</code> can send commands to a running + <code>ovn-appctl</code> can send commands to a running <code>ovn-northd</code> process. The currently supported commands are described below. <dl> diff --git a/ovn-sb.xml b/ovn-sb.xml index 39acb81a41..875200d7a5 100644 --- a/ovn-sb.xml +++ b/ovn-sb.xml @@ -2293,7 +2293,7 @@ that processes it. Packet logging currently uses the same logging mechanism as other Open vSwitch and OVN messages, which means that whether and where log messages appear depends on the local logging - configuration that can be configured with <code>ovs-appctl</code>, + configuration that can be configured with <code>ovn-appctl</code>, etc. </p> <p> diff --git a/rhel/etc_logrotate.d_ovn b/rhel/etc_logrotate.d_ovn index a351ec3038..a62ba91ea8 100644 --- a/rhel/etc_logrotate.d_ovn +++ b/rhel/etc_logrotate.d_ovn @@ -15,7 +15,7 @@ # Tell OVN daemons to reopen their log files if [ -d /var/run/ovn ]; then for ctl in /var/run/ovn/*.ctl; do - ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || : + ovn-appctl -t "$ctl" vlog/reopen 2>/dev/null || : done fi endscript diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index e62ae3a350..0f823b91e7 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -1704,7 +1704,7 @@ for s_az in $(seq 1 $n_az); do udp && udp.src==53 && udp.dst==4369" echo "sending: $packet" AT_CHECK([ovn_trace --ovs "$packet" > ${s_az}-${d_az}-$i.ovn-trace]) - OVS_WAIT_UNTIL([ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([ovn-appctl -t ovn-controller inject-pkt "$packet"]) ovs_inport=$(ovs-vsctl --bare --columns=ofport find Interface external-ids:iface-id="$ovn_inport") ovs_packet=$(echo $packet | ovstest test-ovn expr-to-packets) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 16b77cf018..fd1a6b197a 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -1273,7 +1273,7 @@ ovn_trace() { ovn_trace_client() { target=$1; shift AT_CAPTURE_FILE([trace]) - ovs-appctl -t $target trace "$@" | tee trace | sed '/^# /d' + ovn-appctl -t $target trace "$@" | tee trace | sed '/^# /d' } # Receives a string with scapy python code that represents a packet. diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 419130aa89..9dece913a8 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -462,7 +462,7 @@ check ovn-nbctl --wait=sb lsp-add sw p1 check_row_count Port_Binding 1 logical_port=p1 AT_CHECK([ovn-nbctl --wait=sb lsp-del p1]) -# ovs-appctl exit with unixctl option +# ovn-appctl exit with unixctl option OVS_APP_EXIT_AND_WAIT_BY_TARGET(["$ovs_base"/northd/ovn-northd.ctl], ["$ovs_base"/northd/ovn-northd.pid]) # Check no port_binding entry for new port as ovn-northd is not running @@ -868,7 +868,7 @@ Status: paused ]) AS_BOX([Resume the backup]) -check as northd-backup ovs-appctl -t ovn-northd resume +check as northd-backup ovn-appctl -t ovn-northd resume OVS_WAIT_FOR_OUTPUT([get_northd_status], [0], [false Status: active false @@ -885,8 +885,8 @@ check ovn-nbctl --wait=sb ls-del sw0 check_row_count Datapath_Binding 0 AS_BOX([Pause the main northd]) -check as northd ovs-appctl -t ovn-northd pause -check as northd-backup ovs-appctl -t ovn-northd pause +check as northd ovn-appctl -t ovn-northd pause +check as northd-backup ovn-appctl -t ovn-northd pause AT_CHECK([get_northd_status], [0], [true Status: paused true @@ -902,7 +902,7 @@ check_row_count Datapath_Binding 0 # Do not resume both main and backup right after each other # as there would be no guarentee of which one would become active AS_BOX([Resume the main northd]) -check as northd ovs-appctl -t ovn-northd resume +check as northd ovn-appctl -t ovn-northd resume OVS_WAIT_FOR_OUTPUT([get_northd_status], [0], [false Status: active true @@ -910,7 +910,7 @@ Status: paused ]) AS_BOX([Resume the backup northd]) -check as northd-backup ovs-appctl -t ovn-northd resume +check as northd-backup ovn-appctl -t ovn-northd resume OVS_WAIT_FOR_OUTPUT([get_northd_status], [0], [false Status: active false diff --git a/tests/ovn-performance.at b/tests/ovn-performance.at index 7d480c20c8..44bd4f7e4f 100644 --- a/tests/ovn-performance.at +++ b/tests/ovn-performance.at @@ -100,7 +100,7 @@ read_counters() { local sims="$1" target="$2" counter="$3" for sim in $sims; do - as $sim ovs-appctl -t "$target" coverage/read-counter "$counter" || return 1 + as $sim ovn-appctl -t "$target" coverage/read-counter "$counter" || return 1 done } diff --git a/tests/ovn.at b/tests/ovn.at index afde2576f2..822f799821 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3079,7 +3079,7 @@ done # send packets for unknown datapath AT_CAPTURE_FILE([trace]) -AT_CHECK_UNQUOTED([ovs-appctl -t ovn-trace trace --all lsw100 "inport == p100 && ip4.dst == 10.96.57.175"], [0], [dnl +AT_CHECK_UNQUOTED([ovn-appctl -t ovn-trace trace --all lsw100 "inport == p100 && ip4.dst == 10.96.57.175"], [0], [dnl unknown datapath "lsw100" ]) @@ -6029,7 +6029,7 @@ check ovn-nbctl --wait=hv sync packet="inport==\"ls1-lp1\" && eth.src==$ls1_lp1_mac && eth.dst==$rp_ls1_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_lp1_ip && ip4.dst==$ls2_lp1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) echo "---------NB dump-----" @@ -6079,7 +6079,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_lp1_mac && eth.dst==$rp_ls1_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_lp1_ip && ip4.dst==$ls2_lp1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # The 2nd packet sent shound not be received. OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) @@ -8585,7 +8585,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the drop policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8609,7 +8609,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | grep "192.168.1.0" -c], [0] packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the allow policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8638,7 +8638,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | \ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the allow policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8680,7 +8680,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the drop policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8705,7 +8705,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | grep "192.168.1.0" -c], [0] packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the allow policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8733,7 +8733,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | \ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip4 && ip.ttl==64 && ip4.src==$ls1_p1_ip && ip4.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the allow policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8851,7 +8851,7 @@ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip6 && ip.ttl==64 && ip6.src==$ls1_p1_ip && ip6.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the drop policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8874,7 +8874,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | grep -F "2001" -c], [0], [d packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip6 && ip.ttl==64 && ip6.src==$ls1_p1_ip && ip6.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the allow policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -8903,7 +8903,7 @@ AT_CHECK([ovn-sbctl dump-flows | grep lr_in_policy | \ packet="inport==\"ls1-lp1\" && eth.src==$ls1_p1_mac && eth.dst==$ls1_ro_mac && ip6 && ip.ttl==64 && ip6.src==$ls1_p1_ip && ip6.dst==$ls2_p1_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as pbr-hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as pbr-hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the allow policy OVS_WAIT_UNTIL([test "1" = "$(ovs-ofctl dump-flows br-int | \ @@ -9107,7 +9107,7 @@ check ovn-nbctl --wait=hv destroy Address_Set $row # was updated and then removed. This test case ensures # that ovn-controller is at least still running after # creating, updating, and deleting an address set. -AT_CHECK([ovs-appctl -t ovn-controller version], [0], [ignore]) +AT_CHECK([ovn-appctl -t ovn-controller version], [0], [ignore]) OVN_CLEANUP([hv1]) @@ -10439,73 +10439,73 @@ AT_CAPTURE_FILE([sbflows]) packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4360 && tcp.dst==80" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be dropped with logging in the ingress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4361 && tcp.dst==81" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be dropped without logging in the eggress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4360 && tcp.dst==180" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be dropped with logging in the egress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4361 && tcp.dst==181" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be allowed without logging. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4362 && tcp.dst==82" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be allowed with logging. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4363 && tcp.dst==83" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should allow related flows without logging. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4364 && tcp.dst==84" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should allow related flows with logging. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4365 && tcp.dst==85" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be rejected without logging in the ingress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4366 && tcp.dst==86" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be rejected with logging in the ingress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4367 && tcp.dst==87" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be rejected without logging in the egress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4366 && tcp.dst==186" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Send packet that should be rejected with logging in the egress pipeline. packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && tcp && tcp.flags==2 && tcp.src==4367 && tcp.dst==187" -OVS_WAIT_UNTIL([as hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) OVS_WAIT_UNTIL([ test 8 = $(grep -c 'acl_log' hv/ovn-controller.log) ]) @@ -10599,7 +10599,7 @@ echo "Meter duration: $d_secs" AT_SKIP_IF([test $d_secs -gt 9]) # Print some information that may help debugging. -AT_CHECK([as hv ovs-appctl -t ovn-controller meter-table-list], [0], [dnl +AT_CHECK([as hv ovn-appctl -t ovn-controller meter-table-list], [0], [dnl http-rl1: 1 http-rl2: 2 ]) @@ -18399,7 +18399,7 @@ mirror-to-lp2 # Send a packet from lp1 to lp2, should be mirrored to both mirror ports. packet="inport==\"ls1-lp1\" && eth.src==00:00:00:01:01:02 && eth.dst==00:00:00:01:01:03 && ip4 && ip.ttl==64 && ip4.src==10.0.0.2 && ip4.dst==10.0.0.3 && icmp" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) exp_packet="eth.src==00:00:00:01:01:02 && eth.dst==00:00:00:01:01:03 && ip4 && ip.ttl==64 && ip4.src==10.0.0.2 && ip4.dst==10.0.0.3 && icmp" @@ -19100,7 +19100,7 @@ test_icmp() { icmp4.code==0" shift; shift; shift; shift; shift; shift hv=hv`vif_to_hv $inport` - OVS_WAIT_UNTIL([as $hv ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([as $hv ovn-appctl -t ovn-controller inject-pkt "$packet"]) in_ls=`vif_to_ls $inport` in_lrp=`vif_to_lrp $inport` for outport; do @@ -20253,7 +20253,7 @@ for i in 1 2; do options:rxq_pcap=hv$i/vif$i-rx.pcap \ ofport-request=$i - ovs-appctl -t ovn-controller vlog/set file:dbg:pinctrl + ovn-appctl -t ovn-controller vlog/set file:dbg:pinctrl done check ovn-nbctl lr-add lr0 @@ -20579,7 +20579,7 @@ packet="inport==\"sw1-p1\" && eth.src==$sw1_p1_mac && eth.dst==$sw1_ro_mac && udp && udp.src==53 && udp.dst==4369" # Start by Sending the packet and make sure it makes it there as expected -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Expected packet has TTL decreased by 1 expected="eth.src==$sw2_ro_mac && eth.dst==$sw2_p1_mac && @@ -20590,10 +20590,10 @@ echo $expected | ovstest test-ovn expr-to-packets > expected OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) # Stop ovn-controller on hv2 -as hv2 ovs-appctl -t ovn-controller exit +as hv2 ovn-appctl -t ovn-controller exit # Now send the packet again. This time, it should not arrive. -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) @@ -21456,7 +21456,7 @@ packet="inport==\"sw1-p1\" && eth.src==$sw1_p1_mac && eth.dst==$sw1_ro_mac && udp && udp.src==53 && udp.dst==4369" # Start by Sending the packet and make sure it makes it there as expected -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Expected packet has TTL decreased by 1 expected="eth.src==$sw2_ro_mac && eth.dst==$sw2_p1_mac && @@ -21470,7 +21470,7 @@ OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) OVN_CONTROLLER_EXIT([hv2]) # Now send the packet again. This time, it should still arrive -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) cat expected expected > expected2 @@ -22766,7 +22766,7 @@ ovs-vsctl -- add-port br-int hv1-vif3 -- \ options:rxq_pcap=hv1/vif3-rx.pcap \ ofport-request=3 -ovs-appctl -t ovn-controller vlog/set dbg +ovn-appctl -t ovn-controller vlog/set dbg sim_add hv2 as hv2 @@ -23379,7 +23379,7 @@ AT_CAPTURE_FILE([offlows]) packet0="inport==\"sw0-p11\" && eth.src==00:00:00:00:00:11 && eth.dst==00:00:00:00:00:21 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==192.168.1.100 && tcp && tcp.src==10000 && tcp.dst==80" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet0"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet0"]) wait_row_count controller_event 1 ovn-sbctl list controller_event > events @@ -23408,7 +23408,7 @@ packet1="inport==\"sw1-p0\" && eth.src==00:00:00:00:00:33 && eth.dst==00:00:00:0 ip4 && ip.ttl==64 && ip4.src==192.168.2.11 && ip4.dst==192.168.2.100 && tcp && tcp.src==10000 && tcp.dst==80" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet1"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet1"]) wait_row_count controller_event 1 ovn-sbctl list controller_event uuid=$(ovn-sbctl list controller_event | awk '/_uuid/{print $3}') @@ -23424,7 +23424,7 @@ packet2="inport==\"sw0-p11\" && eth.src==00:00:00:00:00:11 && eth.dst==00:00:00: ip6 && ip.ttl==64 && ip6.src==2001::11 && ip6.dst==2001::10 && tcp && tcp.src==10000 && tcp.dst==50051" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet2"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet2"]) wait_row_count controller_event 1 ovn-sbctl list controller_event uuid=$(ovn-sbctl list controller_event | awk '/_uuid/{print $3}') @@ -25621,7 +25621,7 @@ check ovn-nbctl --wait=hv sync # Get the OF table numbers learn_neigh=$(ovn-debug lflow-stage-to-oftable lr_in_learn_neighbor) -as hv1 ovs-appctl -t ovn-controller vlog/set dbg +as hv1 ovn-appctl -t ovn-controller vlog/set dbg # From sw0-p1 send GARP for 10.0.0.30. # ovn-controller should learn the @@ -27355,7 +27355,7 @@ for i in $(seq 5001 5010); do packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==10.0.0.123 && tcp && tcp.src==$i && tcp.dst==80" - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) for j in 1 2; do # Assume all packets go to lsp2${j}. @@ -27497,7 +27497,7 @@ for i in $(seq 5001 5010); do packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==10.0.0.100 && tcp && tcp.src==$i && tcp.dst==80" - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) for j in 1 2; do # Assume all packets go to lsp2${j}. @@ -27577,7 +27577,7 @@ for i in $(seq 5001 5010); do packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==10.0.0.100 && tcp && tcp.src==$i && tcp.dst==80" - OVS_WAIT_UNTIL([as hv2 ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([as hv2 ovn-appctl -t ovn-controller inject-pkt "$packet"]) for j in 1 2; do # Assume all packets go to lsp2${j}. @@ -27704,7 +27704,7 @@ wait_for_ports_up # Test 1 packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==2.2.2.2 && icmp" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume no packets go neither to lsp21 nor to lsp22. > expected_lsp21 @@ -27734,7 +27734,7 @@ done # Test 2 packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==1.1.1.1 && icmp" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume all packets go to lsp22. exp_packet="eth.src==00:00:00:01:02:01 && eth.dst==f0:00:00:00:02:22 && @@ -27764,7 +27764,7 @@ done # Test 3 packet="inport==\"lsp21\" && eth.src==f0:00:00:00:02:21 && eth.dst==00:00:00:01:02:01 && ip4 && ip.ttl==64 && ip4.src==192.168.2.21 && ip4.dst==2.2.2.2 && icmp" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume all packets go to lsp21. exp_packet="eth.src==00:00:00:01:02:01 && eth.dst==f0:00:00:00:02:21 && @@ -27861,7 +27861,7 @@ wait_for_ports_up # test 1 packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==192.168.2.21 && icmp" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume all packets go to lsp21. exp_packet="eth.src==00:00:00:01:02:01 && eth.dst==f0:00:00:00:02:21 && ip4 && @@ -27895,7 +27895,7 @@ ovs-vsctl set interface hv1-vif2 options:tx_pcap=hv1/vif2-tx.pcap # test 2 packet="inport==\"lsp11\" && eth.src==f0:00:00:00:01:11 && eth.dst==00:00:00:01:01:01 && ip4 && ip.ttl==64 && ip4.src==192.168.1.11 && ip4.dst==192.168.2.200 && icmp" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume all packets go to lsp11. exp_packet="eth.src==00:00:00:01:01:01 && eth.dst==f0:00:00:00:01:11 && ip4 && @@ -28000,7 +28000,7 @@ for i in $(seq 1 2); do packet="inport==\"lsp${i}1\" && eth.src==f0:00:00:00:0${i}:1${i} && eth.dst==00:00:00:01:0${i}:01 && ip4 && ip.ttl==64 && ip4.src==192.168.${i}.${i}1 && ip4.dst==10.0.0.1 && icmp" - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume all packets go to lsp${di}1. exp_packet="eth.src==00:00:00:01:0${di}:01 && eth.dst==f0:00:00:00:0${di}:1${di} && @@ -28115,7 +28115,7 @@ for i in $(seq 1 2); do packet="inport==\"lsp${i}1\" && eth.src==f0:00:00:00:0${i}:1${i} && eth.dst==00:00:00:01:0${i}:01 && ip6 && ip.ttl==64 && ip6.src==2001:db8:${i}::${i}1 && ip6.dst==2001:db8:2000::1 && icmp6" - OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) + OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Assume all packets go to lsp${di}1. exp_packet="eth.src==00:00:00:01:0${di}:01 && eth.dst==f0:00:00:00:0${di}:1${di} && ip6 && @@ -28242,7 +28242,7 @@ dst_ip=172.16.1.11 packet="inport==\"lsp11\" && eth.src==$src_mac && eth.dst==$dst_mac && ip4 && ip.ttl==64 && ip4.src==$src_ip && ip4.dst==$dst_ip && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if the packet hit the forwarding group policy AT_CAPTURE_FILE([offlows2]) @@ -33837,7 +33837,7 @@ packet="inport==\"sw1-lp1\" && eth.src==00:00:04:01:02:03 && ip4.src==10.0.0.100 && ip4.dst==20.0.0.200 && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the drop rule AT_CHECK([ovs-ofctl dump-flows br-int | grep "nw_dst=20.0.0.0/24" | \ @@ -33864,7 +33864,7 @@ packet="inport==\"sw1-lp1\" && eth.src==00:00:04:01:02:03 && ip4.src==10.0.0.100 && ip4.dst==20.0.0.200 && udp && udp.src==53 && udp.dst==4369" -OVS_WAIT_UNTIL([as hv1 ovs-appctl -t ovn-controller inject-pkt "$packet"]) +OVS_WAIT_UNTIL([as hv1 ovn-appctl -t ovn-controller inject-pkt "$packet"]) # Check if packet hit the drop rule AT_CHECK([ovs-ofctl dump-flows br-int "nw_src=10.0.0.0/24" | \ @@ -36624,7 +36624,7 @@ ovs-vsctl --no-wait -- add-port br-int vif2 \ # Check that ovn-controller handled the bindings OVS_WAIT_UNTIL( - [test `ovs-appctl -t ovn-controller debug/dump-local-bindings | grep interface | wc -l` -eq 2], + [test `ovn-appctl -t ovn-controller debug/dump-local-bindings | grep interface | wc -l` -eq 2], [kill -CONT $(cat ovn-sb/ovsdb-server.pid)] ) AT_CHECK([kill -CONT $(cat ovn-sb/ovsdb-server.pid)]) @@ -39149,7 +39149,7 @@ ovs-vsctl -- add-port br-int hv1-vif3 -- \ options:rxq_pcap=hv1/vif3-rx.pcap \ ofport-request=3 -ovs-appctl -t ovn-controller vlog/set dbg +ovn-appctl -t ovn-controller vlog/set dbg check ovn-nbctl ls-add sw0 diff --git a/utilities/ovn-appctl.8.xml b/utilities/ovn-appctl.8.xml index a790e52bb5..e3d024da17 100644 --- a/utilities/ovn-appctl.8.xml +++ b/utilities/ovn-appctl.8.xml @@ -28,7 +28,7 @@ </p> <p> - <code>ovn-ctl</code> is exactly similar to Open vSwitch + <code>ovn-appctl</code> is the equivalent of the Open vSwitch <code>ovs-appctl</code> utility. </p> diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in index 65cbfbcdcd..151af6885b 100644 --- a/utilities/ovn-lib.in +++ b/utilities/ovn-lib.in @@ -163,13 +163,13 @@ stop_ovn_daemon () { actions="TERM .1 .25 .65 1 1 1 1 \ KILL 1 1 1 2 10 15 30 \ FAIL" - version=`ovs-appctl -T 1 -t $ctl_file version \ + version=`ovn-appctl -T 1 -t $ctl_file version \ | awk 'NR==1{print $NF}'` - # Use `ovs-appctl exit` only if the running daemon version + # Use `ovn-appctl exit` only if the running daemon version # is >= 2.5.90. This script might be used during upgrade to # stop older versions of daemons which do not behave correctly - # with `ovs-appctl exit` (e.g. ovs-vswitchd <= 2.5.0 deletes + # with `ovn-appctl exit` (e.g. ovs-vswitchd <= 2.5.0 deletes # internal ports). if version_geq "$version" "2.5.90"; then actions="$graceful $actions" @@ -182,7 +182,7 @@ stop_ovn_daemon () { return 0 fi # But, does the file exist? We may have had a daemon - # segfault with `ovs-appctl exit`. Check one more time + # segfault with `ovn-appctl exit`. Check one more time # before deciding that the daemon is dead. [ -e "$pid_file" ] && sleep 2 && pid=`cat "$pid_file"` 2>/dev/null if pid_exists "$pid" >/dev/null 2>&1; then :; else @@ -192,7 +192,7 @@ stop_ovn_daemon () { case $action in EXIT) action "Exiting $1 ($pid)" \ - ${bindir}/ovs-appctl -T 1 -t $ctl_file exit $other_args + ${bindir}/ovn-appctl -T 1 -t $ctl_file exit $other_args # The above command could have resulted in delayed # daemon segfault. And if a monitor is running, it # would restart the daemon giving it a new pid. diff --git a/utilities/ovn-trace.8.xml b/utilities/ovn-trace.8.xml index be82bf2712..d017a943ed 100644 --- a/utilities/ovn-trace.8.xml +++ b/utilities/ovn-trace.8.xml @@ -281,7 +281,7 @@ <p> If <code>ovn-trace</code> is invoked with the <code>--detach</code> option (see <code>Daemon Options</code>, below), it runs in the background as a - daemon and accepts commands from <code>ovs-appctl</code> (or another + daemon and accepts commands from <code>ovn-appctl</code> (or another JSON-RPC client) indefinitely. The currently supported commands are described below. </p>
This changes all relevant places in the documentation, tests, scripts to use ovn-appctl when targeting OVN daemons. While using ovs-appctl is not necessarily wrong (they're mostly equivalent except for the default paths that are searched ovn_rundir() vs ovs_rundir()) it often confuses users. Reported-at: https://github.com/ovn-kubernetes/ovn-kubernetes/pull/5132#discussion_r2003138389 Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- Documentation/internals/security.rst | 2 +- controller/ovn-controller.8.xml | 4 +- ic/ovn-ic.8.xml | 2 +- northd/ovn-northd.8.xml | 2 +- ovn-sb.xml | 2 +- rhel/etc_logrotate.d_ovn | 2 +- tests/ovn-ic.at | 2 +- tests/ovn-macros.at | 2 +- tests/ovn-northd.at | 12 +-- tests/ovn-performance.at | 2 +- tests/ovn.at | 108 +++++++++++++-------------- utilities/ovn-appctl.8.xml | 2 +- utilities/ovn-lib.in | 10 +-- utilities/ovn-trace.8.xml | 2 +- 14 files changed, 77 insertions(+), 77 deletions(-)