diff mbox series

[ovs-dev] tests: remove ofport-request from tests

Message ID 20220822102714.490974-1-xsimonar@redhat.com
State Changes Requested
Headers show
Series [ovs-dev] tests: remove ofport-request from tests | 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

Xavier Simonart Aug. 22, 2022, 10:27 a.m. UTC 
Testsuite used ofport-request for most of its tests.
However, this causes random tess failures as the Openflow port
number assigned to patch ports can change after its initial assignment.
For instance:
- OVN adds patch port ovn-hv1-0 => get ofport 1.
- tests adds vif1 (w/ ofport-request=1) and vif2 (w/ ofport-request=2).
Now, vif1 will have ofport 1, vif2 ofport 2 and ovn-hv1-0 will be 3.
OVN controller handles properly the behavior i.e. it updates the flows
when ofport changes.
However, this takes some time (roundtrip) and flows might only be installed
after ports are reported up/ovn-installed. This causes some tests
to be flaky, as they might send packets or check flows before OVN completed
ofport related changes.

If CMS wants to use ofport-request, OVN should have an option to use it
internally as well for its patch ports (e.g. through an option providing the
range of port numbers to use).

Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
---
 tests/ovn.at | 834 +++++++++++++++++++--------------------------------
 1 file changed, 312 insertions(+), 522 deletions(-)

Comments

Dumitru Ceara Aug. 26, 2022, 3:16 p.m. UTC | #1 
On 8/22/22 12:27, Xavier Simonart wrote:
> Testsuite used ofport-request for most of its tests.
> However, this causes random tess failures as the Openflow port
> number assigned to patch ports can change after its initial assignment.
> For instance:
> - OVN adds patch port ovn-hv1-0 => get ofport 1.
> - tests adds vif1 (w/ ofport-request=1) and vif2 (w/ ofport-request=2).
> Now, vif1 will have ofport 1, vif2 ofport 2 and ovn-hv1-0 will be 3.
> OVN controller handles properly the behavior i.e. it updates the flows
> when ofport changes.
> However, this takes some time (roundtrip) and flows might only be installed
> after ports are reported up/ovn-installed. This causes some tests
> to be flaky, as they might send packets or check flows before OVN completed
> ofport related changes.
> 
> If CMS wants to use ofport-request, OVN should have an option to use it
> internally as well for its patch ports (e.g. through an option providing the
> range of port numbers to use).
> 
> Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
> ---

Looks good to me, thanks for taking the time to clean this up!

Acked-by: Dumitru Ceara <dceara@redhat.com>

One note though, your other patch here is adding an ofport-request, we
should probably drop that too:

https://patchwork.ozlabs.org/project/ovn/patch/20220825144710.4149344-1-xsimonar@redhat.com/

Regards,
Dumitru
Dumitru Ceara Oct. 4, 2022, 9:13 a.m. UTC | #2 
On 8/26/22 17:16, Dumitru Ceara wrote:
> On 8/22/22 12:27, Xavier Simonart wrote:
>> Testsuite used ofport-request for most of its tests.
>> However, this causes random tess failures as the Openflow port
>> number assigned to patch ports can change after its initial assignment.
>> For instance:
>> - OVN adds patch port ovn-hv1-0 => get ofport 1.
>> - tests adds vif1 (w/ ofport-request=1) and vif2 (w/ ofport-request=2).
>> Now, vif1 will have ofport 1, vif2 ofport 2 and ovn-hv1-0 will be 3.
>> OVN controller handles properly the behavior i.e. it updates the flows
>> when ofport changes.
>> However, this takes some time (roundtrip) and flows might only be installed
>> after ports are reported up/ovn-installed. This causes some tests
>> to be flaky, as they might send packets or check flows before OVN completed
>> ofport related changes.
>>
>> If CMS wants to use ofport-request, OVN should have an option to use it
>> internally as well for its patch ports (e.g. through an option providing the
>> range of port numbers to use).
>>
>> Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
>> ---
> 
> Looks good to me, thanks for taking the time to clean this up!
> 
> Acked-by: Dumitru Ceara <dceara@redhat.com>
> 
> One note though, your other patch here is adding an ofport-request, we
> should probably drop that too:
> 
> https://patchwork.ozlabs.org/project/ovn/patch/20220825144710.4149344-1-xsimonar@redhat.com/
> 

On a second look I noticed we're introducing a race in some of the tests
with this patch, e.g.:

ovs-vsctl -- add-port br-int hv1-vif0
ofport=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif0)

There's no guarantee that ovs-vswitchd gets a chance to run and allocate
the ofport.  Unfortunately we probably need to use an OVS_WAIT_UNTIL or
similar here too.

I'll mark the patch as "Changes Requested" in patchwork.  Could you
please send an amended v2?

Thanks,
Dumitru
diff mbox series

Patch

diff --git a/tests/ovn.at b/tests/ovn.at
index bba2c9c1d..d9ba4e26d 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -2240,7 +2240,7 @@  for i in 1 2 3; do
     ovn_attach n1 br-phys 192.168.0.$i
 
     for j in 1 2 3; do
-        check ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap ofport-request=$i$j
+        check ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap
         check ovn-nbctl lsp-add lsw0 lp$i$j
         if test $j = 1; then
             check ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j 192.168.0.$i$j" unknown
@@ -2509,7 +2509,7 @@  for i in 1 2; do
     ovn_attach n1 br-phys 192.168.0.$i
 
     for j in 1 2; do
-        ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap ofport-request=$i$j
+        ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap
         ovn-nbctl lsp-add lsw0 lp$i$j
         ip_addrs="192.168.0.$i$j"
         ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j $ip_addrs"
@@ -2959,8 +2959,7 @@  for i in 1 2; do
         ovs-vsctl add-port br-int vif$i$j -- \
             set Interface vif$i$j external-ids:iface-id=lp$i$j \
                                   options:tx_pcap=hv$i/vif$i$j-tx.pcap \
-                                  options:rxq_pcap=hv$i/vif$i$j-rx.pcap \
-                                  ofport-request=$i$j
+                                  options:rxq_pcap=hv$i/vif$i$j-rx.pcap
 
         lsp_name=lp$i$j
         ls_name=$(lsp_to_ls $lsp_name)
@@ -3130,8 +3129,7 @@  for hv in 1 2; do
         ovs-vsctl add-port br-int vif-$hv-$ls -- \
             set Interface vif-$hv-$ls external-ids:iface-id=$lsp_name \
                                   options:tx_pcap=hv-$hv/vif-$hv-$ls-tx.pcap \
-                                  options:rxq_pcap=hv-$hv/vif-$hv-$ls-rx.pcap \
-                                  ofport-request=$hv$ls
+                                  options:rxq_pcap=hv-$hv/vif-$hv-$ls-rx.pcap
 
         ovn-nbctl lsp-add ls-${ls}0 $lsp_name
         ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:${hv}${ls}
@@ -3263,8 +3261,7 @@  for hv in 1 2; do
             ovs-vsctl add-port br-int vif-$hv-$ls-$peer -- \
                 set Interface vif-$hv-$ls-$peer external-ids:iface-id=$lsp_name \
                                       options:tx_pcap=hv-$hv/vif-$hv-$ls-$peer-tx.pcap \
-                                      options:rxq_pcap=hv-$hv/vif-$hv-$ls-$peer-rx.pcap \
-                                      ofport-request=$hv$ls$peer
+                                      options:rxq_pcap=hv-$hv/vif-$hv-$ls-$peer-rx.pcap
 
             ovn-nbctl lsp-add ls-${ls}0 $lsp_name
             ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:0${peer}:${hv}${ls}
@@ -3406,8 +3403,7 @@  for i in 1 2; do
     ovs-vsctl add-port br-int vif-$i -- \
         set Interface vif-$i external-ids:iface-id=lp-$i \
                               options:tx_pcap=hv-$i/vif-$i-tx.pcap \
-                              options:rxq_pcap=hv-$i/vif-$i-rx.pcap \
-                              ofport-request=$i
+                              options:rxq_pcap=hv-$i/vif-$i-rx.pcap
 
     lsp_name=lp-$i
     ovn-nbctl lsp-add ls-$i $lsp_name
@@ -3516,8 +3512,7 @@  for i in 1 2; do
     as hv-$i
     check ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
 done
 
 wait_for_ports_up
@@ -3585,8 +3580,7 @@  done
 for i in 1 2; do
     check ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
 done
 
 wait_for_ports_up
@@ -3656,8 +3650,7 @@  for i in 1 2; do
     as hv-$i
     ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
     OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup])
 
     # Patch port might be created after ports are reported up
@@ -3724,8 +3717,7 @@  for i in 1 2; do
     as hv-$i
     check ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
     wait_for_ports_up lsp$i
 
     # Patch port might be created after ports are reported up
@@ -3809,8 +3801,7 @@  for i in 1 2; do
     as hv-$i
     ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
     OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup])
 
     # Patch port might be created after ports are reported up
@@ -3867,8 +3858,7 @@  ovn_attach physnet br-phys 192.168.0.1
 for i in 1 2; do
     ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
     OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup])
 done
 
@@ -3915,8 +3905,7 @@  ovn_attach physnet br-phys 192.168.0.1
 for i in 1 2; do
     ovs-vsctl add-port br-int vif$i -- set Interface vif$i external-ids:iface-id=lsp$i \
                                   options:tx_pcap=vif$i-tx.pcap \
-                                  options:rxq_pcap=vif$i-rx.pcap \
-                                  ofport-request=$i
+                                  options:rxq_pcap=vif$i-rx.pcap
     OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lsp$i` = xup])
 
     : > $i.expected
@@ -4029,8 +4018,7 @@  for tag in 10 20; do
         ovs-vsctl add-port br-int vif-$tag-$i -- \
             set Interface vif-$tag-$i external-ids:iface-id=lp-$tag-$i \
                                   options:tx_pcap=hv-$tag-$i/vif-$tag-$i-tx.pcap \
-                                  options:rxq_pcap=hv-$tag-$i/vif-$tag-$i-rx.pcap \
-                                  ofport-request=$tag$i
+                                  options:rxq_pcap=hv-$tag-$i/vif-$tag-$i-rx.pcap
 
         lsp_name=lp-$tag-$i
         ovn-nbctl lsp-add ls1 $lsp_name
@@ -4156,14 +4144,14 @@  sim_add hv1
 as hv1
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
-ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap ofport-request=1
+ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap
 
 # Create hypervisor hv2 connected to n1
 sim_add hv2
 as hv2
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.2
-ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=hv2/vif2-tx.pcap options:rxq_pcap=hv2/vif2-rx.pcap ofport-request=1
+ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=hv2/vif2-tx.pcap options:rxq_pcap=hv2/vif2-rx.pcap
 
 
 # Start the vtep emulator with a leg in both networks
@@ -4204,7 +4192,7 @@  as hv3
 ovs-vsctl add-br br-phys
 net_attach n2 br-phys
 
-ovs-vsctl add-port br-phys vif3 -- set Interface vif3 options:tx_pcap=hv3/vif3-tx.pcap options:rxq_pcap=hv3/vif3-rx.pcap ofport-request=1
+ovs-vsctl add-port br-phys vif3 -- set Interface vif3 options:tx_pcap=hv3/vif3-tx.pcap options:rxq_pcap=hv3/vif3-rx.pcap
 
 # vtep is quite slow setting up all flows
 OVS_WAIT_UNTIL([test `as vtep ovs-ofctl dump-flows br-vtep_vtep_ls1 | grep "priority=0" | grep "output" | wc -l` -eq 1])
@@ -4373,14 +4361,14 @@  sim_add hv1
 as hv1
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
-ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap ofport-request=1
+ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap
 
 # Create hypervisor hv2 connected to n1
 sim_add hv2
 as hv2
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.2
-ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=hv2/vif2-tx.pcap options:rxq_pcap=hv2/vif2-rx.pcap ofport-request=1
+ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=hv2/vif2-tx.pcap options:rxq_pcap=hv2/vif2-rx.pcap
 
 # Create hypervisor hv_gw connected to n1 and n2
 # connect br-phys bridge to n1; connect hv-gw bridge to n2
@@ -4397,7 +4385,7 @@  sim_add hv3
 as hv3
 ovs-vsctl add-br br-phys
 net_attach n2 br-phys
-ovs-vsctl add-port br-phys vif3 -- set Interface vif3 options:tx_pcap=hv3/vif3-tx.pcap options:rxq_pcap=hv3/vif3-rx.pcap ofport-request=1
+ovs-vsctl add-port br-phys vif3 -- set Interface vif3 options:tx_pcap=hv3/vif3-tx.pcap options:rxq_pcap=hv3/vif3-rx.pcap
 
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
@@ -4591,8 +4579,7 @@  for i in 1 2 3; do
                 -- set Interface vif$i$j$k \
                     external-ids:iface-id=lp$i$j$k \
                     options:tx_pcap=hv$hv/vif$i$j$k-tx.pcap \
-                    options:rxq_pcap=hv$hv/vif$i$j$k-rx.pcap \
-                    ofport-request=$i$j$k
+                    options:rxq_pcap=hv$hv/vif$i$j$k-rx.pcap
         done
     done
 done
@@ -4992,8 +4979,7 @@  for i in 1 2; do
                 -- set Interface vif$i$j \
                     external-ids:iface-id=lp$i$j \
                     options:tx_pcap=hv$hv/vif$i$j-tx.pcap \
-                    options:rxq_pcap=hv$hv/vif$i$j-rx.pcap \
-                    ofport-request=$i$j
+                    options:rxq_pcap=hv$hv/vif$i$j-rx.pcap
     done
 done
 
@@ -5155,7 +5141,7 @@  for i in 1 2 3; do
     ovs-vsctl add-br br-phys
     ovn_attach n1 br-phys 192.168.0.$i
     for j in 1 2 3; do
-        ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap ofport-request=$i$j
+        ovs-vsctl add-port br-int vif$i$j -- set Interface vif$i$j external-ids:iface-id=lp$i$j options:tx_pcap=hv$i/vif$i$j-tx.pcap options:rxq_pcap=hv$i/vif$i$j-rx.pcap
         ovn-nbctl lsp-add lsw0 lp$i$j
         if test $j = 1; then
             ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j 192.168.0.$i$j" unknown
@@ -5593,8 +5579,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -5603,8 +5588,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
@@ -5715,14 +5699,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int vif2 -- \
     set interface vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 
 wait_for_ports_up
@@ -5825,14 +5807,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int vif2 -- \
     set interface vif2 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 wait_for_ports_up
 check ovn-nbctl --wait=hv sync
@@ -5933,14 +5913,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=alice1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 sim_add hv2
 as hv2
@@ -5949,8 +5927,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=bob1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
@@ -6140,14 +6117,13 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
+ofport1=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif1)
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=alice1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 sim_add hv2
 as hv2
@@ -6156,8 +6132,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=bob1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
@@ -6176,7 +6151,7 @@  src_ip=`ip_to_hex 192 168 1 2`
 dst_ip=`ip_to_hex 172 16 1 2`
 packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000
 as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet
-as hv1 ovs-appctl ofproto/trace br-int in_port=1 $packet
+as hv1 ovs-appctl ofproto/trace br-int in_port=$ofport1 $packet
 
 # Send ip packets between foo1 and bob1
 src_mac="f00000010203"
@@ -6279,26 +6254,22 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 check ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 check ovs-vsctl -- add-port br-int hv1-vif4 -- \
     set interface hv1-vif4 external-ids:iface-id=ls2-lp2 \
     options:tx_pcap=hv1/vif4-tx.pcap \
-    options:rxq_pcap=hv1/vif4-rx.pcap \
-    ofport-request=4
+    options:rxq_pcap=hv1/vif4-rx.pcap
 
 as hv1 ovs-appctl vlog/set dbg
 
@@ -6988,32 +6959,27 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif4 -- \
     set interface hv1-vif4 external-ids:iface-id=ls2-lp2 \
     options:tx_pcap=hv1/vif4-tx.pcap \
-    options:rxq_pcap=hv1/vif4-rx.pcap \
-    ofport-request=4
+    options:rxq_pcap=hv1/vif4-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif5 -- \
     set interface hv1-vif5 external-ids:iface-id=ls1-lp3 \
     options:tx_pcap=hv1/vif5-tx.pcap \
-    options:rxq_pcap=hv1/vif5-rx.pcap \
-    ofport-request=5
+    options:rxq_pcap=hv1/vif5-rx.pcap
 
 OVN_POPULATE_ARP
 
@@ -7225,8 +7191,8 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
+ofport1=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif1)
 
 
 sim_add hv2
@@ -7236,8 +7202,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=alice1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
 # packets for ARP resolution (native tunneling doesn't queue packets
@@ -7327,7 +7292,7 @@  expected=${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}00351
 
 
 as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet
-as hv1 ovs-appctl ofproto/trace br-int in_port=1 $packet
+as hv1 ovs-appctl ofproto/trace br-int in_port=$ofport1 $packet
 
 echo "------ hv1 dump after packet 1 ----------"
 as hv1 ovs-ofctl show br-int
@@ -7417,14 +7382,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int vif2 -- \
     set interface vif2 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 # Allow some time for ovn-northd and ovn-controller to catch up.
 wait_for_ports_up
@@ -7572,20 +7535,17 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=pbr-hv/vif1-tx.pcap \
-    options:rxq_pcap=pbr-hv/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=pbr-hv/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int vif2 -- \
     set interface vif2 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=pbr-hv/vif2-tx.pcap \
-    options:rxq_pcap=pbr-hv/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=pbr-hv/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int vif3 -- \
     set interface vif3 external-ids:iface-id=ls3-lp1 \
     options:tx_pcap=pbr-hv/vif3-tx.pcap \
-    options:rxq_pcap=pbr-hv/vif3-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=pbr-hv/vif3-rx.pcap
 
 ls1_ro_mac=00:00:00:01:02:f1
 ls1_ro_ip=192.168.1.1
@@ -7758,20 +7718,17 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=pbr-hv/vif1-tx.pcap \
-    options:rxq_pcap=pbr-hv/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=pbr-hv/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int vif2 -- \
     set interface vif2 external-ids:iface-id=ls2-lp1 \
     options:tx_pcap=pbr-hv/vif2-tx.pcap \
-    options:rxq_pcap=pbr-hv/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=pbr-hv/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int vif3 -- \
     set interface vif3 external-ids:iface-id=ls3-lp1 \
     options:tx_pcap=pbr-hv/vif3-tx.pcap \
-    options:rxq_pcap=pbr-hv/vif3-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=pbr-hv/vif3-rx.pcap
 
 ls1_ro_mac=00:00:00:01:02:f1
 ls1_ro_ip=2001::1
@@ -8011,13 +7968,13 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.2
 
 # Add vif1 to hv1 and lsw0, turn on l2 port security on vif1.
-ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap ofport-request=1
+ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap
 ovn-nbctl lsp-add lsw0 lp1
 ovn-nbctl lsp-set-addresses lp1 "fa:16:3e:94:05:98 192.168.0.3 fd81:ce49:a948:0:f816:3eff:fe94:598"
 ovn-nbctl lsp-set-port-security lp1 "fa:16:3e:94:05:98 192.168.0.3 fd81:ce49:a948:0:f816:3eff:fe94:598"
 
 # Add vif2 to hv1 and lsw0, turn on l2 port security on vif2.
-ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=hv1/vif2-tx.pcap options:rxq_pcap=hv1/vif2-rx.pcap ofport-request=2
+ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=hv1/vif2-tx.pcap options:rxq_pcap=hv1/vif2-rx.pcap
 ovn-nbctl lsp-add lsw0 lp2
 ovn-nbctl lsp-set-addresses lp2 "fa:16:3e:a1:f9:ae 192.168.0.4 fd81:ce49:a948:0:f816:3eff:fea1:f9ae"
 ovn-nbctl lsp-set-port-security lp2 "fa:16:3e:a1:f9:ae 192.168.0.4 fd81:ce49:a948:0:f816:3eff:fea1:f9ae"
@@ -8454,20 +8411,17 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=foo2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=alice1 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 # Allow some time for ovn-northd and ovn-controller to catch up.
 wait_for_ports_up
@@ -8554,8 +8508,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 OVN_POPULATE_ARP
 sleep 2
@@ -8673,13 +8626,11 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-ls1lp2 -- \
     set interface hv1-ls1lp2 external-ids:iface-id=ls1lp2 \
     options:tx_pcap=hv1/ls1lp2-tx.pcap \
-    options:rxq_pcap=hv1/ls1lp2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/ls1lp2-rx.pcap
 ovs-vsctl -- add-port br-int hv1-ls2lp2 -- \
     set interface hv1-ls2lp2 external-ids:iface-id=ls2lp2 \
     options:tx_pcap=hv1/ls2lp2-tx.pcap \
-    options:rxq_pcap=hv1/ls2lp2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/ls2lp2-rx.pcap
 
 # Allow some time for ovn-northd and ovn-controller to catch up.
 wait_for_ports_up
@@ -9580,8 +9531,8 @@  sim_add hv
 as hv
 check ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
-check ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=vif1-tx.pcap options:rxq_pcap=vif1-rx.pcap ofport-request=1
-check ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=vif2-tx.pcap options:rxq_pcap=vif2-rx.pcap ofport-request=2
+check ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lp1 options:tx_pcap=vif1-tx.pcap options:rxq_pcap=vif1-rx.pcap
+check ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lp2 options:tx_pcap=vif2-tx.pcap options:rxq_pcap=vif2-rx.pcap
 wait_for_ports_up lp1 lp2
 
 # Extracts nw_tos from the final flow from ofproto/trace output and prints
@@ -9957,14 +9908,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vm1 -- \
     set interface vm1 external-ids:iface-id=vm1 \
     options:tx_pcap=hv1/vm1-tx.pcap \
-    options:rxq_pcap=hv1/vm1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vm1-rx.pcap
 
 ovs-vsctl -- add-port br-int bar3 -- \
     set interface bar3 external-ids:iface-id=bar3 \
     options:tx_pcap=hv1/bar3-tx.pcap \
-    options:rxq_pcap=hv1/bar3-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/bar3-rx.pcap
 
 sim_add hv2
 as hv2
@@ -9973,8 +9922,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int vm2 -- \
     set interface vm2 external-ids:iface-id=vm2 \
     options:tx_pcap=hv2/vm2-tx.pcap \
-    options:rxq_pcap=hv2/vm2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vm2-rx.pcap
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
 # packets for ARP resolution (native tunneling doesn't queue packets
@@ -10198,14 +10146,14 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
+ofport1=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif1)
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=bar1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
+ofport2=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif2)
 
 sim_add hv2
 as hv2
@@ -10214,8 +10162,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=alice1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 sim_add hv3
 as hv3
@@ -10224,8 +10171,7 @@  ovn_attach n1 br-phys 192.168.0.3
 ovs-vsctl -- add-port br-int hv3-vif1 -- \
     set interface hv3-vif1 external-ids:iface-id=bob1 \
     options:tx_pcap=hv3/vif1-tx.pcap \
-    options:rxq_pcap=hv3/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv3/vif1-rx.pcap
 
 
 ovn-nbctl create Logical_Router name=R1
@@ -10328,7 +10274,7 @@  src_ip=`ip_to_hex 192 168 1 2`
 dst_ip=`ip_to_hex 172 16 1 3`
 packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000
 as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet
-as hv1 ovs-appctl ofproto/trace br-int in_port=1 $packet
+as hv1 ovs-appctl ofproto/trace br-int in_port=$ofport1 $packet
 
 # Send ip packets between bar1 and bob1
 src_mac="f00000010204"
@@ -10337,7 +10283,7 @@  src_ip=`ip_to_hex 192 168 2 2`
 dst_ip=`ip_to_hex 172 16 1 4`
 packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000
 as hv1 ovs-appctl netdev-dummy/receive hv1-vif2 $packet
-#as hv1 ovs-appctl ofproto/trace br-int in_port=2 $packet
+#as hv1 ovs-appctl ofproto/trace br-int in_port=$ofport2 $packet
 
 # Packet to expect at bar1
 src_mac="000001010204"
@@ -10408,14 +10354,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 OVN_POPULATE_ARP
 wait_for_ports_up
@@ -10913,8 +10857,7 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add gw1
 as gw1
@@ -10933,8 +10876,7 @@  ovn_attach n1 br-phys 192.168.0.3
 check ovs-vsctl -- add-port br-int ext1-vif1 -- \
     set interface ext1-vif1 external-ids:iface-id=outside1 \
     options:tx_pcap=ext1/vif1-tx.pcap \
-    options:rxq_pcap=ext1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=ext1/vif1-rx.pcap
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
 # packets for ARP resolution (native tunneling doesn't queue packets
@@ -11168,8 +11110,7 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add gw1
 as gw1
@@ -11188,8 +11129,7 @@  ovn_attach n1 br-phys 192.168.0.3
 check ovs-vsctl -- add-port br-int ext1-vif1 -- \
     set interface ext1-vif1 external-ids:iface-id=outside1 \
     options:tx_pcap=ext1/vif1-tx.pcap \
-    options:rxq_pcap=ext1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=ext1/vif1-rx.pcap
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
 # packets for ARP resolution (native tunneling doesn't queue packets
@@ -11416,8 +11356,7 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -11431,8 +11370,7 @@  ovn_attach n1 br-phys 192.168.0.3
 check ovs-vsctl -- add-port br-int hv3-vif1 -- \
     set interface hv3-vif1 external-ids:iface-id=outside1 \
     options:tx_pcap=hv3/vif1-tx.pcap \
-    options:rxq_pcap=hv3/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv3/vif1-rx.pcap
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
 # packets for ARP resolution (native tunneling doesn't queue packets
@@ -11662,8 +11600,7 @@  AT_CHECK_UNQUOTED([ovn_trace --minimal foo 'inport == "foo1" && eth.src == f0:00
 as hv1 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=alice1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovn-nbctl lsp-add alice alice1 \
 -- lsp-set-addresses alice1 "f0:00:00:01:02:05 172.16.1.4"
@@ -11672,8 +11609,7 @@  ovn-nbctl lsp-add alice alice1 \
 as hv2 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=foo2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 ovn-nbctl lsp-add foo foo2 \
 -- lsp-set-addresses foo2 "f0:00:00:01:02:06 192.168.1.3"
@@ -11803,11 +11739,9 @@  as hv1 reset_pcap_file snoopvif hv1/snoopvif
 
 # Add OVS ports for foo1 and foo2 on hv3
 ovs-vsctl -- add-port br-int hv3-vif1 -- \
-    set interface hv3-vif1 external-ids:iface-id=foo1 \
-    ofport-request=1
+    set interface hv3-vif1 external-ids:iface-id=foo1
 ovs-vsctl -- add-port br-int hv3-vif2 -- \
-    set interface hv3-vif2 external-ids:iface-id=foo2 \
-    ofport-request=2
+    set interface hv3-vif2 external-ids:iface-id=foo2
 
 # Add bridge-mapping on hv3
 AT_CHECK([as hv3 ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=physnet1:br-phys])
@@ -11887,8 +11821,7 @@  start_daemon ovn-controller
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -11903,8 +11836,7 @@  ovn_attach n1 br-phys 192.168.0.3
 check ovs-vsctl -- add-port br-int hv3-vif1 -- \
     set interface hv3-vif1 external-ids:iface-id=outside1 \
     options:tx_pcap=hv3/vif1-tx.pcap \
-    options:rxq_pcap=hv3/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv3/vif1-rx.pcap
 ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings="phys:br-phys"
 
 sim_add hv4
@@ -12205,20 +12137,17 @@  ovn-nbctl acl-add lsw0 to-lport 1002 'outport == "lp3" && ip6 && icmp6'  allow-r
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=lp3 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 # Allow some time for ovn-northd and ovn-controller to catch up.
 wait_for_ports_up
@@ -12469,8 +12398,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=foo1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -12479,8 +12407,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=alice1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
@@ -12543,14 +12470,11 @@  for i in 1 2; do
     ovs-vsctl add-port br-int vif01 -- \
         set Interface vif01 external-ids:iface-id=lp01 \
                               options:tx_pcap=hv${i}/vif${i}0-tx.pcap \
-                              options:rxq_pcap=hv${i}/vif${i}0-rx.pcap \
-                              ofport-request=${i}0
-
+                              options:rxq_pcap=hv${i}/vif${i}0-rx.pcap
     ovs-vsctl add-port br-int vif${i}1 -- \
         set Interface vif${i}1 external-ids:iface-id=lp${i}1 \
                               options:tx_pcap=hv${i}/vif${i}1-tx.pcap \
-                              options:rxq_pcap=hv${i}/vif${i}1-rx.pcap \
-                              ofport-request=${i}1
+                              options:rxq_pcap=hv${i}/vif${i}1-rx.pcap
 
     ovn-nbctl lsp-add ls1 lp${i}1
     ovn-nbctl lsp-set-addresses lp${i}1 f0:00:00:00:00:${i}1
@@ -12646,26 +12570,30 @@  for i in 1 2; do
     done
 done
 
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
-10
-11
+vif01_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=vif01)
+vif11_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=vif11)
+
+AT_CHECK_UNQUOTED([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
+$vif01_ofport
+$vif11_ofport
 ])
 
 # remove the localport from br-int and re-create it
 as hv1
 check ovs-vsctl del-port vif01
 check ovn-nbctl --wait=hv sync
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
-11
+AT_CHECK_UNQUOTED([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
+$vif11_ofport
 ])
 
 as hv1
 check ovs-vsctl add-port br-int vif01 \
     -- set Interface vif01 external-ids:iface-id=lp01
 check ovn-nbctl --wait=hv sync
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
-2
-11
+vif01_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=vif01)
+AT_CHECK_UNQUOTED([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
+$vif11_ofport
+$vif01_ofport
 ])
 
 OVN_CLEANUP([hv1],[hv2])
@@ -12936,8 +12864,7 @@  for i in 1 2; do
     ovs-vsctl -- add-port br-int hv$i-vif1 -- \
         set interface hv$i-vif1 external-ids:iface-id=inside$i \
         options:tx_pcap=hv$i/vif1-tx.pcap \
-        options:rxq_pcap=hv$i/vif1-rx.pcap \
-        ofport-request=1
+        options:rxq_pcap=hv$i/vif1-rx.pcap
 
         ovn-nbctl lsp-add inside inside$i \
             -- lsp-set-addresses inside$i "f0:00:00:01:22:$i 192.168.1.10$i"
@@ -13305,8 +13232,7 @@  for i in 1 2; do
     ovs-vsctl -- add-port br-int hv$i-vif1 -- \
         set interface hv$i-vif1 external-ids:iface-id=inside$i \
         options:tx_pcap=hv$i/vif1-tx.pcap \
-        options:rxq_pcap=hv$i/vif1-rx.pcap \
-        ofport-request=1
+        options:rxq_pcap=hv$i/vif1-rx.pcap
 done
 
 hv1_ch_uuid=$(fetch_column Chassis _uuid name=hv1)
@@ -13623,8 +13549,7 @@  ovn_attach n1 br-phys 192.168.0.11
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=inside1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovn-nbctl lsp-add inside inside1 \
         -- lsp-set-addresses inside1 "f0:00:00:01:22:01 192.168.1.101"
@@ -13764,8 +13689,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0_ip6-port1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 sim_add hv2
@@ -13776,8 +13700,7 @@  ovn_attach n1 br-phys 192.168.0.3
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1_ip6-port1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 ovn-nbctl --wait=sb sync
@@ -15227,15 +15150,13 @@  sim_add hv1
 as hv1
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.11
-ovs-vsctl -- add-port br-int hv1-vif0 -- \
-set Interface hv1-vif0 ofport-request=1
+ovs-vsctl -- add-port br-int hv1-vif0
 
 sim_add hv2
 as hv2
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.12
-ovs-vsctl -- add-port br-int hv2-vif0 -- \
-set Interface hv2-vif0 ofport-request=1
+ovs-vsctl -- add-port br-int hv2-vif0
 
 # Allow only chassis hv1 to bind logical port lsp0.
 ovn-nbctl lsp-set-options lsp0 requested-chassis=hv1
@@ -15258,7 +15179,8 @@  OVS_WAIT_UNTIL([test 1 = $(grep -c "Not claiming lport lsp0" hv2/ovn-controller.
 wait_row_count Port_Binding 1 logical_port=lsp0 'chassis=[[]]'
 
 # (2) Chassis hv2 should not add flows in OFTABLE_PHY_TO_LOG and OFTABLE_LOG_TO_PHY tables.
-AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [1], [])
+ofport_hv2=$(as hv2 ovs-vsctl --bare --columns ofport find Interface name=hv2-vif0)
+AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=0 | grep in_port=$ofport_hv2], [1], [])
 AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=65 | grep output], [1], [])
 
 # (3) Chassis hv1 should bind lsp0 when physical to logical mapping exists on hv1.
@@ -15270,9 +15192,10 @@  OVS_WAIT_UNTIL([test 1 = $(grep -c "Claiming lport lsp0" hv1/ovn-controller.log)
 wait_column "$hv1_uuid" Port_Binding chassis logical_port=lsp0
 
 # (4) Chassis hv1 should add flows in OFTABLE_PHY_TO_LOG and OFTABLE_LOG_TO_PHY tables.
+ofport_hv1=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=hv1-vif0)
 as hv1 ovs-ofctl dump-flows br-int
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [0], [ignore])
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep actions=output:1], [0], [ignore])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=$ofport_hv1], [0], [ignore])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep actions=output:$ofport_hv1], [0], [ignore])
 
 # (5) Chassis hv1 should release lsp0 binding and chassis hv2 should bind lsp0 when
 # the requested chassis for lsp0 is changed from hv1 to hv2.
@@ -15283,10 +15206,10 @@  OVS_WAIT_UNTIL([test 1 = $(grep -c "Releasing lport lsp0 from this chassis" hv1/
 wait_column "$hv2_uuid" Port_Binding chassis logical_port=lsp0
 
 # (6) Chassis hv2 should add flows and hv1 should not.
-AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [0], [ignore])
-AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=65 | grep actions=output:1], [0], [ignore])
+AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=0 | grep in_port=$ofport_hv2], [0], [ignore])
+AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=65 | grep actions=output:$ofport_hv2], [0], [ignore])
 
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [1], [])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=$ofport_hv1], [1], [])
 AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep output], [1], [])
 
 OVN_CLEANUP([hv1],[hv2])
@@ -15349,7 +15272,9 @@  as hv1
 ovs-vsctl set Open_vSwitch . external-ids:hostname=hv1-hostname
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.11
-ovs-vsctl -- add-port br-int hv1-vif0 -- set Interface hv1-vif0 ofport-request=1
+ovs-vsctl -- add-port br-int hv1-vif0
+ofport=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif0)
+
 
 wait_row_count Chassis 1 name=hv1
 hv1_hostname=$(fetch_column Chassis hostname name=hv1)
@@ -15362,14 +15287,14 @@  hv1_uuid=$(fetch_column Chassis _uuid name=hv1)
 echo "hv1_uuid=${hv1_uuid}"
 OVS_WAIT_UNTIL([test 1 = $(grep -c "Claiming lport lsp0" hv1/ovn-controller.log)])
 wait_column "$hv1_uuid" Port_Binding chassis logical_port=lsp0
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [0], [ignore])
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep actions=output:1], [0], [ignore])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=$ofport], [0], [ignore])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep actions=output:$ofport], [0], [ignore])
 
 check ovn-nbctl --wait=hv lsp-set-options lsp0 requested-chassis=non-existant-chassis
 OVS_WAIT_UNTIL([test 1 = $(grep -c "Releasing lport lsp0 from this chassis" hv1/ovn-controller.log)])
 check ovn-nbctl --wait=hv sync
 wait_column '' Port_Binding chasssi logical_port=lsp0
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [1], [])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=$ofport], [1], [])
 AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep output], [1], [])
 
 OVN_CLEANUP([hv1])
@@ -15429,8 +15354,7 @@  for i in 1 2 ; do
     ovs-vsctl -- add-port br-int hv$i-vif1 -- \
         set interface hv$i-vif1 external-ids:iface-id=sw-p$i \
         options:tx_pcap=hv$i/vif1-tx.pcap \
-        options:rxq_pcap=hv$i/vif1-rx.pcap \
-        ofport-request=1
+        options:rxq_pcap=hv$i/vif1-rx.pcap
 done
 
 OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up sw-p1` = xup])
@@ -15682,8 +15606,7 @@  for i in 1 2 ; do
     check ovs-vsctl -- add-port br-int hv$i-vif1 -- \
         set interface hv$i-vif1 external-ids:iface-id=sw-p$i \
         options:tx_pcap=hv$i/vif1-tx.pcap \
-        options:rxq_pcap=hv$i/vif1-rx.pcap \
-        ofport-request=1
+        options:rxq_pcap=hv$i/vif1-rx.pcap
 done
 
 wait_for_ports_up
@@ -15926,8 +15849,7 @@  for i in 1 2 3; do
                 set interface vif$i$j \
                 external-ids:iface-id=sw0-p$i$j \
                 options:tx_pcap=hv$i/vif$i$j-tx.pcap \
-                options:rxq_pcap=hv$i/vif$i$j-rx.pcap \
-                ofport-request=$i$j
+                options:rxq_pcap=hv$i/vif$i$j-rx.pcap
     done
 done
 
@@ -16003,8 +15925,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -16013,8 +15934,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 ovn-nbctl ls-add sw0
 
@@ -16196,8 +16116,7 @@  for i in 1 2 3; do
                 -- set Interface vif$i$j$k \
                     external-ids:iface-id=lp$i$j$k \
                     options:tx_pcap=hv$hv/vif$i$j$k-tx.pcap \
-                    options:rxq_pcap=hv$hv/vif$i$j$k-rx.pcap \
-                    ofport-request=$i$j$k
+                    options:rxq_pcap=hv$hv/vif$i$j$k-rx.pcap
         done
     done
 done
@@ -16416,8 +16335,7 @@  for i in 1 2 3; do
                 -- set Interface vif$i$j$k \
                     external-ids:iface-id=lp$i$j$k \
                     options:tx_pcap=hv$hv/vif$i$j$k-tx.pcap \
-                    options:rxq_pcap=hv$hv/vif$i$j$k-rx.pcap \
-                    ofport-request=$i$j$k
+                    options:rxq_pcap=hv$hv/vif$i$j$k-rx.pcap
         done
     done
 done
@@ -16681,14 +16599,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovn-nbctl create Address_Set name=set1 \
 addresses=\"10.0.0.4\",\"10.0.0.5\",\"10.0.0.6\"
@@ -16981,14 +16897,12 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 # test_ip INPORT SRC_MAC DST_MAC SRC_IP DST_IP OUTPORT...
 #
@@ -17250,14 +17164,12 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=ls1-lp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovn-nbctl create address_set name=as1 addresses="10.0.0.1"
 ovn-nbctl create address_set name=as2 addresses="10.0.0.11,10.0.0.12"
@@ -17317,7 +17229,7 @@  for i in 1 2 3; do
     ovs-vsctl add-br br-phys
     ovn_attach n1 br-phys 192.168.0.$i
 
-    ovs-vsctl add-port br-int vif${i}1 -- set Interface vif${i}1 external-ids:iface-id=lp${i}1 options:tx_pcap=hv$i/vif${i}1-tx.pcap options:rxq_pcap=hv$i/vif${i}1-rx.pcap ofport-request=${i}1
+    ovs-vsctl add-port br-int vif${i}1 -- set Interface vif${i}1 external-ids:iface-id=lp${i}1 options:tx_pcap=hv$i/vif${i}1-tx.pcap options:rxq_pcap=hv$i/vif${i}1-rx.pcap
     ovn-nbctl lsp-add lsw0 lp${i}1
     ovn-nbctl lsp-set-addresses lp${i}1 "f0:00:00:00:00:${i}1 192.168.0.${i}1" unknown
 done
@@ -17566,8 +17478,7 @@  for i in 1 2; do
         set interface vif$i \
         external-ids:iface-id=sw$i-p${i}0 \
             options:tx_pcap=hv$i/vif$i-tx.pcap \
-            options:rxq_pcap=hv$i/vif$i-rx.pcap \
-            ofport-request=$i
+            options:rxq_pcap=hv$i/vif$i-rx.pcap
 done
 
 ovn-nbctl lr-add lr0
@@ -17779,8 +17690,7 @@  for i in 1 2; do
         set interface vif$i \
         external-ids:iface-id=sw$i-p${i}0 \
             options:tx_pcap=hv$i/vif$i-tx.pcap \
-            options:rxq_pcap=hv$i/vif$i-rx.pcap \
-            ofport-request=$i
+            options:rxq_pcap=hv$i/vif$i-rx.pcap
 done
 
 ovn-nbctl lr-add lr0
@@ -17858,8 +17768,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -17868,8 +17777,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw2-p1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 OVN_POPULATE_ARP
 
@@ -17966,8 +17874,7 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-phys hv1-ext1 -- \
     set interface hv1-ext1 options:tx_pcap=hv1/ext1-tx.pcap \
-    options:rxq_pcap=hv1/ext1-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/ext1-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 as hv2
@@ -17975,8 +17882,7 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-phys hv2-ext2 -- \
     set interface hv2-ext2 options:tx_pcap=hv2/ext2-tx.pcap \
-    options:rxq_pcap=hv2/ext2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv2/ext2-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 as hv3
@@ -17984,8 +17890,7 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.3
 ovs-vsctl -- add-port br-phys hv3-ext3 -- \
     set interface hv3-ext3 options:tx_pcap=hv3/ext3-tx.pcap \
-    options:rxq_pcap=hv3/ext3-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv3/ext3-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 # No DHCPv4/v6 flows for the external port - ls1-lp_ext1 - 10.0.0.6 in hv1 and
@@ -18754,8 +18659,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -18764,8 +18668,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw2-p1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 OVN_POPULATE_ARP
 
@@ -18909,13 +18812,11 @@  ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-port1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-port2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 # IPv4 outgoing traffic generated inside the cluster
 test_ip_packet_larger() {
@@ -19359,8 +19260,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p0 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 sim_add hv2
 as hv2
@@ -19369,13 +19269,11 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p0 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv2/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv2-vif2 -- \
     set interface hv2-vif2 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv2/vif2-tx.pcap \
-    options:rxq_pcap=hv2/vif2-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv2/vif2-rx.pcap
 
 ovn-nbctl create Logical_Router name=lr0
 ovn-nbctl ls-add sw0
@@ -19931,8 +19829,7 @@  for i in 1 2; do
     ovs-vsctl add-port br-int vif$i$i -- \
         set Interface vif$i$i external-ids:iface-id=lp$i$i \
                               options:tx_pcap=hv$i/vif$i$i-tx.pcap \
-                              options:rxq_pcap=hv$i/vif$i$i-rx.pcap \
-                              ofport-request=$i$i
+                              options:rxq_pcap=hv$i/vif$i$i-rx.pcap
 
     lsp_name=lp$i$i
     ls_name=$(lsp_to_ls $lsp_name)
@@ -20070,18 +19967,15 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-p3 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 ovs-appctl -t ovn-controller vlog/set dbg
 
@@ -20092,13 +19986,11 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv2-vif2 -- \
     set interface hv2-vif2 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv2/vif2-tx.pcap \
-    options:rxq_pcap=hv2/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv2/vif2-rx.pcap
 
 ovn-nbctl ls-add sw0
 
@@ -20698,8 +20590,7 @@  for i in 1 2; do
                 set interface vif$i$j \
                 external-ids:iface-id=sw0-p$i$j \
                 options:tx_pcap=hv$i/vif$i$j-tx.pcap \
-                options:rxq_pcap=hv$i/vif$i$j-rx.pcap \
-                ofport-request=$i$j
+                options:rxq_pcap=hv$i/vif$i$j-rx.pcap
     done
 done
 
@@ -20710,8 +20601,7 @@  ovs-vsctl -- add-port br-int vif33 -- \
         set interface vif33 \
         external-ids:iface-id=sw1-p0 \
         options:tx_pcap=hv$i/vif33-tx.pcap \
-        options:rxq_pcap=hv$i/vif33-rx.pcap \
-        ofport-request=33
+        options:rxq_pcap=hv$i/vif33-rx.pcap
 
 ovn-nbctl --event lb-add lb0 192.168.1.100:80 ""
 ovn-nbctl ls-lb-add sw0 lb0
@@ -20868,23 +20758,19 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw1-p11 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw1-p12 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=sw2-p1 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif3-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif4 -- \
     set interface hv1-vif4 external-ids:iface-id=sw3-p1 \
     options:tx_pcap=hv1/vif4-tx.pcap \
-    options:rxq_pcap=hv1/vif4-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif4-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 sim_add hv2
@@ -20894,23 +20780,19 @@  ovn_attach n1 br-phys 192.168.0.2
 check ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p21 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv2-vif2 -- \
     set interface hv2-vif2 external-ids:iface-id=sw1-p22 \
     options:tx_pcap=hv2/vif2-tx.pcap \
-    options:rxq_pcap=hv2/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif2-rx.pcap
 check ovs-vsctl -- add-port br-int hv2-vif3 -- \
     set interface hv2-vif3 external-ids:iface-id=sw2-p2 \
     options:tx_pcap=hv2/vif3-tx.pcap \
-    options:rxq_pcap=hv2/vif3-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif3-rx.pcap
 check ovs-vsctl -- add-port br-int hv2-vif4 -- \
     set interface hv2-vif4 external-ids:iface-id=sw3-p2 \
     options:tx_pcap=hv2/vif4-tx.pcap \
-    options:rxq_pcap=hv2/vif4-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif4-rx.pcap
 ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 AT_CAPTURE_FILE([exp])
@@ -21605,23 +21487,19 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw1-p11 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw1-p12 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif2-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=sw2-p1 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif3-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif4 -- \
     set interface hv1-vif4 external-ids:iface-id=sw3-p1 \
     options:tx_pcap=hv1/vif4-tx.pcap \
-    options:rxq_pcap=hv1/vif4-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif4-rx.pcap
 check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 sim_add hv2
@@ -21631,23 +21509,19 @@  ovn_attach n1 br-phys 192.168.0.2
 check ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p21 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv2-vif2 -- \
     set interface hv2-vif2 external-ids:iface-id=sw1-p22 \
     options:tx_pcap=hv2/vif2-tx.pcap \
-    options:rxq_pcap=hv2/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif2-rx.pcap
 check ovs-vsctl -- add-port br-int hv2-vif3 -- \
     set interface hv2-vif3 external-ids:iface-id=sw2-p2 \
     options:tx_pcap=hv2/vif3-tx.pcap \
-    options:rxq_pcap=hv2/vif3-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif3-rx.pcap
 check ovs-vsctl -- add-port br-int hv2-vif4 -- \
     set interface hv2-vif4 external-ids:iface-id=sw3-p2 \
     options:tx_pcap=hv2/vif4-tx.pcap \
-    options:rxq_pcap=hv2/vif4-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif4-rx.pcap
 check ovs-vsctl set open . external-ids:ovn-bridge-mappings=phys:br-phys
 
 wait_for_ports_up
@@ -22369,8 +22243,7 @@  m4_define([DVR_N_S_ARP_HANDLING],
        ovs-vsctl add-port br-int vif$i$i -- \
            set Interface vif$i$i external-ids:iface-id=lp$i$i \
                                  options:tx_pcap=hv$i/vif$i$i-tx.pcap \
-                                 options:rxq_pcap=hv$i/vif$i$i-rx.pcap \
-                                 ofport-request=$i$i
+                                 options:rxq_pcap=hv$i/vif$i$i-rx.pcap
 
        lsp_name=lp$i$i
        ls_name=$(lsp_to_ls $lsp_name)
@@ -22417,8 +22290,7 @@  m4_define([DVR_N_S_ARP_HANDLING],
    as hv4 ovs-vsctl add-port br-int vif-north -- \
            set Interface vif-north external-ids:iface-id=lp-north \
                                  options:tx_pcap=hv4/vif-north-tx.pcap \
-                                 options:rxq_pcap=hv4/vif-north-rx.pcap \
-                                 ofport-request=44
+                                 options:rxq_pcap=hv4/vif-north-rx.pcap
 
    ovn-nbctl lr-add router
    ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03 192.168.1.3/24
@@ -22641,8 +22513,7 @@  m4_define([DVR_N_S_PING],
        ovs-vsctl add-port br-int vif$i$i -- \
            set Interface vif$i$i external-ids:iface-id=lp$i$i \
                                  options:tx_pcap=hv$i/vif$i$i-tx.pcap \
-                                 options:rxq_pcap=hv$i/vif$i$i-rx.pcap \
-                                 ofport-request=$i$i
+                                 options:rxq_pcap=hv$i/vif$i$i-rx.pcap
 
        lsp_name=lp$i$i
        ls_name=$(lsp_to_ls $lsp_name)
@@ -22689,8 +22560,7 @@  m4_define([DVR_N_S_PING],
    as hv4 ovs-vsctl add-port br-int vif-north -- \
            set Interface vif-north external-ids:iface-id=lp-north \
                                  options:tx_pcap=hv4/vif-north-tx.pcap \
-                                 options:rxq_pcap=hv4/vif-north-rx.pcap \
-                                 ofport-request=44
+                                 options:rxq_pcap=hv4/vif-north-rx.pcap
 
    ovn-nbctl lr-add router
    ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03 192.168.1.3/24
@@ -22898,13 +22768,11 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-p3 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 sim_add hv2
 as hv2
@@ -22913,8 +22781,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 ovn-nbctl ls-add sw0
 
@@ -23129,8 +22996,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl add-port br-int vif11 -- \
     set Interface vif11 external-ids:iface-id=lp11 \
                           options:tx_pcap=hv1/vif11-tx.pcap \
-                          options:rxq_pcap=hv1/vif11-rx.pcap \
-                          ofport-request=11
+                          options:rxq_pcap=hv1/vif11-rx.pcap
 
 lsp_name=lp11
 
@@ -23240,8 +23106,7 @@  for i in 1 2; do
     ovs-vsctl add-port br-int vif$i$i -- \
         set Interface vif$i$i external-ids:iface-id=lp$i$i \
                               options:tx_pcap=hv$i/vif$i$i-tx.pcap \
-                              options:rxq_pcap=hv$i/vif$i$i-rx.pcap \
-                              ofport-request=$i$i
+                              options:rxq_pcap=hv$i/vif$i$i-rx.pcap
 
     lsp_name=lp$i$i
     ls_name=$(lsp_to_ls $lsp_name)
@@ -23288,8 +23153,7 @@  as hv4 ovn_attach n1 br-phys 192.168.0.4
 as hv4 ovs-vsctl add-port br-int vif-north -- \
         set Interface vif-north external-ids:iface-id=lp-north \
                               options:tx_pcap=hv4/vif-north-tx.pcap \
-                              options:rxq_pcap=hv4/vif-north-rx.pcap \
-                              ofport-request=44
+                              options:rxq_pcap=hv4/vif-north-rx.pcap
 
 ovn-nbctl lr-add router
 ovn-nbctl lrp-add router router-to-ls1 00:00:01:01:02:03 192.168.1.3/24
@@ -23482,13 +23346,11 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 sim_add hv2
 as hv2
@@ -23497,8 +23359,7 @@  ovn_attach n1 br-phys 192.168.0.2
 check ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 check ovn-nbctl ls-add sw0
 
@@ -23696,13 +23557,11 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 sim_add hv2
 as hv2
@@ -23711,8 +23570,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 ovn-nbctl ls-add sw0
 
@@ -23896,24 +23754,21 @@  as hv1
 check ovs-vsctl -- add-port br-int hv1-vif0 -- \
     set interface hv1-vif0 external-ids:iface-id=sw-agg-ext \
     options:tx_pcap=hv1/vif0-tx.pcap \
-    options:rxq_pcap=hv1/vif0-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif0-rx.pcap
 
 # Bind a "VM" connected to sw1 on hv1.
 as hv1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 # Bind a "VM" connected to sw1 on hv2.
 as hv2
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw1-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 OVN_POPULATE_ARP
 wait_for_ports_up
@@ -24275,7 +24130,7 @@  as hv1
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl add-port br-int vif1 -- \
-    set interface vif1 external-ids:iface-id=lp1 ofport-request=1
+    set interface vif1 external-ids:iface-id=lp1
 
 ovn-nbctl ls-add lsw0
 ovn-nbctl lsp-add lsw0 lp1
@@ -24324,8 +24179,7 @@  for az in `seq 1 $n_az`; do
         check ovs-vsctl -- add-port br-int vif$p -- \
             set interface vif$p external-ids:iface-id=lsp$az-$p \
             options:tx_pcap=hv$az/vif$p-tx.pcap \
-            options:rxq_pcap=hv$az/vif$p-rx.pcap \
-            ofport-request=$p
+            options:rxq_pcap=hv$az/vif$p-rx.pcap
     done
 
     sim_add gw$az
@@ -24989,20 +24843,17 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp11 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=lsp21 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=lsp22 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 # wait for earlier changes to take effect
 check ovn-nbctl --wait=hv sync
@@ -25112,20 +24963,17 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp11 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=lsp21 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=lsp22 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 # wait for earlier changes to take effect
 check ovn-nbctl --wait=hv sync
@@ -25275,14 +25123,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp11 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=lsp21 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 # wait for earlier changes to take effect
 check ovn-nbctl --wait=hv sync
@@ -25414,8 +25260,7 @@  for i in $(seq 1 4); do
     ovs-vsctl -- add-port br-int hv1-vif${i} -- \
         set interface hv1-vif${i} external-ids:iface-id=lsp${i}1 \
         options:tx_pcap=hv1/vif${i}-tx.pcap \
-        options:rxq_pcap=hv1/vif${i}-rx.pcap \
-        ofport-request=${i}
+        options:rxq_pcap=hv1/vif${i}-rx.pcap
 done
 
 # wait for earlier changes to take effect
@@ -25528,8 +25373,7 @@  for i in $(seq 1 4); do
     ovs-vsctl -- add-port br-int hv1-vif${i} -- \
         set interface hv1-vif${i} external-ids:iface-id=lsp${i}1 \
         options:tx_pcap=hv1/vif${i}-tx.pcap \
-        options:rxq_pcap=hv1/vif${i}-rx.pcap \
-        ofport-request=${i}
+        options:rxq_pcap=hv1/vif${i}-rx.pcap
 done
 
 # wait for earlier changes to take effect
@@ -25613,21 +25457,21 @@  sim_add hv1
 as hv1
 check ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
-check ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lsp11 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap ofport-request=1
+check ovs-vsctl add-port br-int vif1 -- set Interface vif1 external-ids:iface-id=lsp11 options:tx_pcap=hv1/vif1-tx.pcap options:rxq_pcap=hv1/vif1-rx.pcap
 
 # Create hypervisor hv2 connected to n1
 sim_add hv2
 as hv2
 check ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.2
-check ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lsp21 options:tx_pcap=hv2/vif2-tx.pcap options:rxq_pcap=hv2/vif2-rx.pcap ofport-request=1
+check ovs-vsctl add-port br-int vif2 -- set Interface vif2 external-ids:iface-id=lsp21 options:tx_pcap=hv2/vif2-tx.pcap options:rxq_pcap=hv2/vif2-rx.pcap
 
 # Create hypervisor hv3 connected to n1
 sim_add hv3
 as hv3
 check ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.3
-check ovs-vsctl add-port br-int vif3 -- set Interface vif3 external-ids:iface-id=lsp22 options:tx_pcap=hv3/vif3-tx.pcap options:rxq_pcap=hv3/vif3-rx.pcap ofport-request=1
+check ovs-vsctl add-port br-int vif3 -- set Interface vif3 external-ids:iface-id=lsp22 options:tx_pcap=hv3/vif3-tx.pcap options:rxq_pcap=hv3/vif3-rx.pcap
 
 # Add a forwarding group on ls2 with lsp21 and lsp22 as child ports
 # virtual IP - 172.16.1.11, virtual MAC - 00:11:de:ad:be:ef
@@ -25771,8 +25615,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 # One logical switch with IPv4 and IPv6 load balancers that hairpin the
 # traffic.
@@ -26166,8 +26009,7 @@  sim_add hv1
 as hv1
 ovs-vsctl add-br br-int
 ovs-vsctl add-port br-int p1 \
-    -- set Interface p1 external-ids:iface-id=lsp1 \
-    -- set Interface p1 ofport-request=1
+    -- set Interface p1 external-ids:iface-id=lsp1
 OVS_WAIT_UNTIL([ovs-vsctl list Interface p1])
 
 ovn_start
@@ -26230,13 +26072,11 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-port1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-port2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 as hv1 check ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=public:br-phys
 
@@ -26574,13 +26414,11 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 sim_add hv2
 as hv2
@@ -26589,8 +26427,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 ovn-nbctl ls-add sw0
 
@@ -26750,8 +26587,7 @@  as hv1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 wait_for_ports_up sw0-p1
 
@@ -26770,8 +26606,7 @@  as hv2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 wait_for_ports_up sw0-p2
 
@@ -26814,8 +26649,7 @@  as hv1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 wait_for_ports_up sw0-p1
 
@@ -26834,8 +26668,7 @@  as hv2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 wait_for_ports_up sw0-p2
 
@@ -26875,8 +26708,7 @@  as hv1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovn-nbctl ls-add sw0
 ovn-nbctl lsp-add sw0 sw0-p1
@@ -26960,15 +26792,13 @@  as hv1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 as hv1
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p1) = xup])
 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p2) = xup])
@@ -27350,8 +27180,8 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
+ofport1=$(ovs-vsctl --bare --columns ofport find Interface name=hv1-vif1)
 
 sim_add hv2
 as hv2
@@ -27360,8 +27190,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
@@ -27391,7 +27220,7 @@  dst_ip=`ip_to_hex 10 0 2 2`
 echo "${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}0035111100080000" > expected
 
 OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected])
-as hv1 ovs-appctl ofproto/trace br-int in_port=1 $packet
+as hv1 ovs-appctl ofproto/trace br-int in_port=$ofport1 $packet
 
 # MAC binding entry should have generated
 AT_CHECK([ovn-sbctl find mac ip=10.0.0.2 mac='"00:00:00:00:03:02"' logical_port=lrp-r1-join | grep 10\.0\.0\.2], [0], [ignore], [])
@@ -27531,12 +27360,13 @@  check ovn-nbctl lsp-add sw lsp2
 as hv1
 ovs-vsctl \
     -- add-port br-int vif1 \
-    -- set Interface vif1 external_ids:iface-id=lsp1 \
-    ofport-request=1
+    -- set Interface vif1 external_ids:iface-id=lsp1
+ofport1=$(ovs-vsctl --bare --columns ofport find Interface name=vif1)
+
 ovs-vsctl \
     -- add-port br-int vif2 \
-    -- set Interface vif2 external_ids:iface-id=lsp2 \
-    ofport-request=2
+    -- set Interface vif2 external_ids:iface-id=lsp2
+ofport2=$(ovs-vsctl --bare --columns ofport find Interface name=vif2)
 
 # Wait for ports to be bound.
 wait_row_count Chassis 1 name=hv1
@@ -27547,10 +27377,10 @@  wait_row_count Port_Binding 1 logical_port=lsp2 chassis=$ch
 AS_BOX([check output flows for initial interfaces])
 as hv1 ovs-ofctl dump-flows br-int table=65 > offlows_table65.txt
 AT_CAPTURE_FILE([offlows_table65.txt])
-AT_CHECK_UNQUOTED([grep -c "output:1" offlows_table65.txt], [0], [dnl
+AT_CHECK_UNQUOTED([grep -c "output:$ofport1" offlows_table65.txt], [0], [dnl
 1
 ])
-AT_CHECK_UNQUOTED([grep -c "output:2" offlows_table65.txt], [0], [dnl
+AT_CHECK_UNQUOTED([grep -c "output:$ofport2" offlows_table65.txt], [0], [dnl
 1
 ])
 
@@ -27565,11 +27395,11 @@  ovs-vsctl \
 as hv1
 ovs-vsctl \
     -- add-port br-int vif1 \
-    -- set Interface vif1 external_ids:iface-id=lsp1 \
-    ofport-request=3 \
+    -- set Interface vif1 external_ids:iface-id=lsp1
     -- add-port br-int vif2 \
-    -- set Interface vif2 external_ids:iface-id=lsp2 \
-    ofport-request=4
+    -- set Interface vif2 external_ids:iface-id=lsp2
+ofport3=$(ovs-vsctl --bare --columns ofport find Interface name=vif1)
+ofport4=$(ovs-vsctl --bare --columns ofport find Interface name=vif2)
 
 as hv1 ovn-appctl -t ovn-controller debug/resume
 check ovn-nbctl --wait=hv sync
@@ -27577,10 +27407,10 @@  check ovn-nbctl --wait=hv sync
 AS_BOX([check output flows for new interfaces])
 as hv1 ovs-ofctl dump-flows br-int table=65 > offlows_table65_2.txt
 AT_CAPTURE_FILE([offlows_table65_2.txt])
-AT_CHECK_UNQUOTED([grep -c "output:3" offlows_table65_2.txt], [0], [dnl
+AT_CHECK_UNQUOTED([grep -c "output:$ofport3" offlows_table65_2.txt], [0], [dnl
 1
 ])
-AT_CHECK_UNQUOTED([grep -c "output:4" offlows_table65_2.txt], [0], [dnl
+AT_CHECK_UNQUOTED([grep -c "output:$ofport4" offlows_table65_2.txt], [0], [dnl
 1
 ])
 
@@ -27599,8 +27429,7 @@  ovn_attach n1 br-phys 192.168.0.10
 as hv1
 ovs-vsctl \
     -- add-port br-int vif1 \
-    -- set Interface vif1 external_ids:iface-id=lsp1 \
-    ofport-request=1
+    -- set Interface vif1 external_ids:iface-id=lsp1
 
 check ovn-nbctl ls-add ls1 \
     -- ls-add ls2 \
@@ -27628,8 +27457,7 @@  AS_BOX([readd OVS VIF])
 as hv1
 ovs-vsctl \
     -- add-port br-int vif1 \
-    -- set Interface vif1 external_ids:iface-id=lsp1 \
-    ofport-request=1
+    -- set Interface vif1 external_ids:iface-id=lsp1
 wait_row_count Port_Binding 1 logical_port=lsp1 chassis=$ch
 
 AS_BOX([readd OVN container port])
@@ -27686,8 +27514,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 # Pre-populate the hypervisors' ARP tables so that we don't lose any
 # packets for ARP resolution (native tunneling doesn't queue packets
@@ -27857,13 +27684,11 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-port1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw3-port1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=physnet1:br-phys])
 ovs-vsctl set open . external_ids:ovn-enable-lflow-cache=false
 
@@ -27874,8 +27699,7 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-port2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=physnet1:br-phys])
 ovs-vsctl set open . external_ids:ovn-enable-lflow-cache=false
 
@@ -27886,8 +27710,7 @@  ovn_attach n1 br-phys 192.168.0.3
 ovs-vsctl -- add-port br-int hv3-vif1 -- \
     set interface hv3-vif1 external-ids:iface-id=sw1-port1 \
     options:tx_pcap=hv3/vif1-tx.pcap \
-    options:rxq_pcap=hv3/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv3/vif1-rx.pcap
 AT_CHECK([ovs-vsctl set Open_vSwitch . external-ids:ovn-bridge-mappings=physnet1:br-phys])
 ovs-vsctl set open . external_ids:ovn-enable-lflow-cache=false
 
@@ -27995,8 +27818,7 @@  ovn-nbctl --wait=hv sync
 as hv2
 ovs-vsctl -- add-port br-phys hv2-phys1 -- \
     set interface hv2-phys1 options:tx_pcap=hv2/phys1-tx.pcap \
-    options:rxq_pcap=hv2/phys1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/phys1-rx.pcap
 
 send_arp_request() {
     local eth_src=$1 spa=$2 tpa=$3
@@ -28124,14 +27946,12 @@  ovn_attach n1 br-phys 192.168.0.1
 check ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 check ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=lsp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 # Default drop
 check ovn-nbctl acl-add ls1 to-lport 1000 \
@@ -28231,14 +28051,12 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=lsp2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 # Default drop
 ovn-nbctl acl-add ls1 to-lport 1000 \
@@ -28321,8 +28139,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=lsp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 wait_for_ports_up
 ovn-nbctl --wait=hv sync
@@ -28456,13 +28273,11 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 ovs-vsctl set open . external_ids:ovn-check-ct-label-for-lb-hairpin=false
 
 sim_add hv2
@@ -28472,13 +28287,11 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw1-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 
 check ovn-nbctl --wait=hv ls-add sw0
 check ovn-nbctl lsp-add sw0 sw0-p1 -- lsp-set-addresses sw0-p1 00:00:00:00:00:01
@@ -28936,12 +28749,12 @@  check ovn-nbctl lsp-add sw0 sw0-p2
 as hv1
 ovs-vsctl \
     -- add-port br-int vif1 \
-    -- set Interface vif1 external_ids:iface-id=sw0-p1 \
-    ofport-request=1
+    -- set Interface vif1 external_ids:iface-id=sw0-p1
+ofport1=$(ovs-vsctl --bare --columns ofport find Interface name=vif1)
 ovs-vsctl \
     -- add-port br-int vif2 \
-    -- set Interface vif2 external_ids:iface-id=sw0-p2 \
-    ofport-request=2
+    -- set Interface vif2 external_ids:iface-id=sw0-p2
+ofport2=$(ovs-vsctl --bare --columns ofport find Interface name=vif2)
 
 # Wait for port to be bound.
 wait_row_count Chassis 1 name=hv1
@@ -28972,7 +28785,7 @@  wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]'
 
 as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt
 AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
+AT_CHECK_UNQUOTED([grep -c "in_port=$ofport2" offlows_table0.txt], [1], [dnl
 0
 ])
 
@@ -28995,7 +28808,7 @@  wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]'
 
 as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt
 AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
+AT_CHECK_UNQUOTED([grep -c "in_port=$ofport2" offlows_table0.txt], [1], [dnl
 0
 ])
 
@@ -29006,7 +28819,7 @@  wait_row_count Port_Binding 1 logical_port=sw0-p2 chassis=$ch
 
 as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt
 AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [0], [dnl
+AT_CHECK_UNQUOTED([grep -c "in_port=$ofport2" offlows_table0.txt], [0], [dnl
 1
 ])
 
@@ -29033,7 +28846,7 @@  sleep 1
 
 as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt
 AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [0], [dnl
+AT_CHECK_UNQUOTED([grep -c "in_port=$ofport2" offlows_table0.txt], [0], [dnl
 1
 ])
 
@@ -29052,7 +28865,7 @@  check ovs-vsctl set open . external_ids:ovn-remote=$ovn_remote
 wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]'
 as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt
 AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
+AT_CHECK_UNQUOTED([grep -c "in_port=$ofport2" offlows_table0.txt], [1], [dnl
 0
 ])
 
@@ -29171,8 +28984,7 @@  ovn_attach n1 br-phys 192.168.0.10
 as hv1
 ovs-vsctl \
     -- add-port br-int vif1 \
-    -- set Interface vif1 external_ids:iface-id=sw0-port1 \
-    ofport-request=1
+    -- set Interface vif1 external_ids:iface-id=sw0-port1
 
 check ovn-nbctl ls-add sw0
 check ovn-nbctl lsp-add sw0 sw0-port1
@@ -29254,8 +29066,7 @@  as hv1
 for i in 1 2; do
     ovs-vsctl \
         -- add-port br-int vif$i \
-        -- set Interface vif$i external_ids:iface-id=sw0-p$i \
-        ofport-request=$i
+        -- set Interface vif$i external_ids:iface-id=sw0-p$i
 done
 
 check as hv1
@@ -29394,18 +29205,15 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif2 -- \
     set interface hv1-vif2 external-ids:iface-id=sw1-p2 \
     options:tx_pcap=hv1/vif2-tx.pcap \
-    options:rxq_pcap=hv1/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/vif2-rx.pcap
 ovs-vsctl -- add-port br-int hv1-vif3 -- \
     set interface hv1-vif3 external-ids:iface-id=sw0-p3 \
     options:tx_pcap=hv1/vif3-tx.pcap \
-    options:rxq_pcap=hv1/vif3-rx.pcap \
-    ofport-request=3
+    options:rxq_pcap=hv1/vif3-rx.pcap
 
 sim_add hv2
 as hv2
@@ -29414,13 +29222,11 @@  ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl -- add-port br-int hv2-vif1 -- \
     set interface hv2-vif1 external-ids:iface-id=sw0-p2 \
     options:tx_pcap=hv2/vif1-tx.pcap \
-    options:rxq_pcap=hv2/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv2-vif2 -- \
     set interface hv2-vif2 external-ids:iface-id=sw1-p1 \
     options:tx_pcap=hv2/vif2-tx.pcap \
-    options:rxq_pcap=hv2/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv2/vif2-rx.pcap
 
 sim_add hv3
 as hv3
@@ -29429,13 +29235,11 @@  ovn_attach n1 br-phys 192.168.0.3
 ovs-vsctl -- add-port br-int hv3-vif1 -- \
     set interface hv3-vif1 external-ids:iface-id=sw0-p4 \
     options:tx_pcap=hv3/vif1-tx.pcap \
-    options:rxq_pcap=hv3/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv3/vif1-rx.pcap
 ovs-vsctl -- add-port br-int hv3-vif2 -- \
     set interface hv3-vif2 external-ids:iface-id=sw1-p3 \
     options:tx_pcap=hv3/vif2-tx.pcap \
-    options:rxq_pcap=hv3/vif2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv3/vif2-rx.pcap
 
 OVN_POPULATE_ARP
 
@@ -29978,8 +29782,8 @@  sim_add hv1
 as hv1
 ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
-ovs-vsctl -- add-port br-int vm1 -- set interface vm1 ofport-request=1
-ovs-vsctl -- add-port br-int vm2 -- set interface vm1 ofport-request=2
+ovs-vsctl -- add-port br-int vm1
+ovs-vsctl -- add-port br-int vm2
 
 check ovn-nbctl ls-add ls
 check ovn-nbctl lsp-add ls vm1
@@ -30665,8 +30469,7 @@  ovn-nbctl lsp-add sw1 sw1-lp1 \
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 # Install static routes to drop traffic
 ovn-nbctl lr-route-add lr1 20.0.0.0/24 discard
@@ -30759,8 +30562,7 @@  ovn_attach n1 br-phys 192.16.0.1
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=ls1-lp1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 # And proxy ARP flows for 69.254.239.254 and 169.254.239.2
 # and check that SB flows have been added.
@@ -31023,27 +30825,23 @@  done
 as hv1 ovs-vsctl add-port br-int vif11 -- \
     set Interface vif11 external-ids:iface-id=lp11 \
                               options:tx_pcap=hv1/vif11-tx.pcap \
-                              options:rxq_pcap=hv1/vif11-rx.pcap \
-                              ofport-request=11
+                              options:rxq_pcap=hv1/vif11-rx.pcap
 OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lp11` = xup])
 
 as hv5 ovs-vsctl add-port br-int vif-north1 -- \
         set Interface vif-north1 external-ids:iface-id=lp-north1 \
                               options:tx_pcap=hv5/vif-north1-tx.pcap \
-                              options:rxq_pcap=hv5/vif-north1-rx.pcap \
-                              ofport-request=44
+                              options:rxq_pcap=hv5/vif-north1-rx.pcap
 
 as hv5 ovs-vsctl add-port br-int vif-north2 -- \
         set Interface vif-north2 external-ids:iface-id=lp-north2 \
                               options:tx_pcap=hv5/vif-north2-tx.pcap \
-                              options:rxq_pcap=hv5/vif-north2-rx.pcap \
-                              ofport-request=45
+                              options:rxq_pcap=hv5/vif-north2-rx.pcap
 
 as hv5 ovs-vsctl add-port br-int vif-north3 -- \
         set Interface vif-north3 external-ids:iface-id=lp-north3 \
                               options:tx_pcap=hv5/vif-north3-tx.pcap \
-                              options:rxq_pcap=hv5/vif-north3-rx.pcap \
-                              ofport-request=46
+                              options:rxq_pcap=hv5/vif-north3-rx.pcap
 
 ovn-nbctl lrp-set-gateway-chassis DR-S1 hv2
 ovn-nbctl lrp-set-gateway-chassis DR-S2 hv3
@@ -31453,10 +31251,11 @@  grep sw0-port1 -c], [0], [1
 ])
 
 check as hv1 ovs-vsctl add-port br-int vif13 \
-    -- set interface vif13 external_ids:iface-id=sw0-port2 ofport-request=13
+    -- set interface vif13 external_ids:iface-id=sw0-port2
+ofport13=$(as hv1 ovs-vsctl --bare --columns ofport find Interface name=vif13)
 
 ovn-nbctl --wait=hv sync
-OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=0 | grep "in_port=13" | wc -l` -eq 1])
+OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=0 | grep "in_port=$ofport13" | wc -l` -eq 1])
 
 # There should be ct zone for sw0-port2 (localport).
 AT_CHECK([as hv1 ovn-appctl -t ovn-controller ct-zone-list | \
@@ -31527,10 +31326,10 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl add-port br-int localport \
     -- set interface localport \
-       external_ids:iface-id=sw0-localport \
-       ofport-request=13
+       external_ids:iface-id=sw0-localport
 ovs-vsctl add-port br-int vm1 \
     -- set interface vm1 external_ids:iface-id=sw0-vm1
+ofport=$(ovs-vsctl --bare --columns ofport find Interface name=vm1)
 
 sim_add hv2
 as hv2
@@ -31538,8 +31337,7 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.2
 ovs-vsctl add-port br-int localport \
     -- set interface localport \
-       external_ids:iface-id=sw0-localport \
-       ofport-request=13
+       external_ids:iface-id=sw0-localport
 ovs-vsctl add-port br-int vm2 \
     -- set interface vm2 external_ids:iface-id=sw0-vm2
 
@@ -31551,13 +31349,13 @@  OVS_WAIT_UNTIL([
     as hv1 \
     ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 \
     | tee 1-hv1-br-int-table-0.txt \
-    && grep -q in_port=13 1-hv1-br-int-table-0.txt
+    && grep -q in_port=$ofport 1-hv1-br-int-table-0.txt
 ])
 OVS_WAIT_UNTIL([
     as hv2 \
     ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 \
     | tee 1-hv2-br-int-table-0.txt \
-    && grep in_port=13 1-hv2-br-int-table-0.txt
+    && grep in_port=$ofport 1-hv2-br-int-table-0.txt
 ])
 
 # Confirm that the controllers did not attempt to claim the localport
@@ -31863,8 +31661,7 @@  ovn-nbctl lsp-set-addresses lp11 "00:00:11:11:44:44 20.0.0.10"
 ovs-vsctl add-port br-int vif11 -- \
     set Interface vif11 external-ids:iface-id=lp11 \
                               options:tx_pcap=hv1/vif11-tx.pcap \
-                              options:rxq_pcap=hv1/vif11-rx.pcap \
-                              ofport-request=11
+                              options:rxq_pcap=hv1/vif11-rx.pcap
 OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up lp11) = xup])
 
 ovn-nbctl lrp-set-gateway-chassis lr0-ext-ls0 hv1
@@ -32022,7 +31819,7 @@  check ovn-nbctl lsp-add sw0 sw0p2 -- lsp-set-addresses sw0p2 "00:00:00:00:00:04
 
 as hv1
 ovs-vsctl -- add-port br-int hv1-vif0 -- \
-set Interface hv1-vif0 external-ids:iface-id=sw0p1 ofport-request=1
+set Interface hv1-vif0 external-ids:iface-id=sw0p1
 
 wait_for_ports_up sw0p1
 
@@ -32148,7 +31945,7 @@  check_port_sec_offlows hv2 75
 
 as hv2
 ovs-vsctl -- add-port br-int hv2-vif0 -- \
-set Interface hv2-vif0 external-ids:iface-id=sw0p2 ofport-request=1
+set Interface hv2-vif0 external-ids:iface-id=sw0p2
 
 wait_for_ports_up
 # There should be no changes in hv1
@@ -32303,7 +32100,7 @@  check ovs-vsctl add-port br-int ls0-hv -- set Interface ls0-hv external-ids:ifac
 check ovn-nbctl lr-add lr0
 
 check ovn-nbctl ls-add ls0
-check ovn-nbctl lsp-add ls0 ls0-lr0 
+check ovn-nbctl lsp-add ls0 ls0-lr0
 check ovn-nbctl lsp-set-type ls0-lr0 router
 check ovn-nbctl lsp-set-addresses ls0-lr0 router
 check ovn-nbctl lrp-add lr0 lr0-ls0 00:00:00:00:00:01 10.0.0.1
@@ -32381,13 +32178,11 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int vif0 -- \
     set interface vif0 external-ids:iface-id=vif0 \
     options:tx_pcap=hv1/vif0-tx.pcap \
-    options:rxq_pcap=hv1/vif0-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif0-rx.pcap
 ovs-vsctl -- add-port br-phys ext0 -- \
     set interface ext0 \
     options:tx_pcap=hv1/ext0-tx.pcap \
-    options:rxq_pcap=hv1/ext0-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/ext0-rx.pcap
 ovs-vsctl set open . external_ids:ovn-bridge-mappings=physnet1:br-phys
 
 send_packet() {
@@ -32469,13 +32264,11 @@  ovs-vsctl add-br br-phys
 ovs-vsctl -- add-port br-int vif1 -- \
     set interface vif1 external-ids:iface-id=vif1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 ovs-vsctl -- add-port br-phys ext1 -- \
     set interface ext1 \
     options:tx_pcap=hv1/ext1-tx.pcap \
-    options:rxq_pcap=hv1/ext1-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv1/ext1-rx.pcap
 ovs-vsctl set open . external_ids:ovn-bridge-mappings=physnet1:br-phys
 
 sim_add hv2
@@ -32486,13 +32279,11 @@  ovs-vsctl add-br br-phys
 ovs-vsctl -- add-port br-int vif2 -- \
     set interface vif2 external-ids:iface-id=vif2 \
     options:tx_pcap=hv2/vif2-tx.pcap \
-    options:rxq_pcap=hv2/vif2-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv2/vif2-rx.pcap
 ovs-vsctl -- add-port br-phys ext2 -- \
     set interface ext2 \
     options:tx_pcap=hv2/ext2-tx.pcap \
-    options:rxq_pcap=hv2/ext2-rx.pcap \
-    ofport-request=2
+    options:rxq_pcap=hv2/ext2-rx.pcap
 ovs-vsctl set open . external_ids:ovn-bridge-mappings=physnet1:br-phys
 
 OVN_POPULATE_ARP
@@ -32552,8 +32343,7 @@  ovn_attach n1 br-phys 192.168.0.1
 ovs-vsctl -- add-port br-int hv1-vif1 -- \
     set interface hv1-vif1 external-ids:iface-id=sw0-p1 \
     options:tx_pcap=hv1/vif1-tx.pcap \
-    options:rxq_pcap=hv1/vif1-rx.pcap \
-    ofport-request=1
+    options:rxq_pcap=hv1/vif1-rx.pcap
 
 check ovn-nbctl ls-add sw0
 check ovn-nbctl lr-add ro0