Skip to content

Commit 09be992

Browse files
simonartxavieralmusil
authored andcommitted
tests: Add missing check for ovn-nbctl in ovn-ic.at.
Signed-off-by: Xavier Simonart <xsimonar@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com> (cherry picked from commit a9d49f5)
1 parent 5e595af commit 09be992

1 file changed

Lines changed: 59 additions & 59 deletions

File tree

tests/ovn-ic.at

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ovn_az_attach az1 n1 br-phys 192.168.1.1
4747
check ovs-vsctl set open . external-ids:ovn-is-interconn=true
4848

4949
az_uuid=$(fetch_column ic-sb:availability-zone _uuid name="az1")
50-
ovn_as az1 ovn-nbctl set NB_Global . name="az2"
50+
check ovn_as az1 ovn-nbctl set NB_Global . name="az2"
5151

5252
check ovn-ic-nbctl --wait=sb sync
5353
check_column "$az_uuid" ic-sb:availability-zone _uuid name="az2"
@@ -443,7 +443,7 @@ check ovn-nbctl lr-add lr1
443443
check ovn-nbctl lrp-add lr1 lrp-lr1-ts1 aa:aa:aa:aa:aa:01 169.254.100.1/24
444444
check ovn-nbctl --wait=hv lsp-add-router-port ts1 lsp-ts1-lr1 lrp-lr1-ts1
445445
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl show | grep lsp-ts1-lr1])
446-
ovn_as az2 ovn-nbctl lsp-set-options lsp-ts1-lr1 requested-chassis=gw1
446+
check ovn_as az2 ovn-nbctl lsp-set-options lsp-ts1-lr1 requested-chassis=gw1
447447

448448
OVS_WAIT_FOR_OUTPUT([ovn_as az2 ovn-nbctl show | uuidfilt], [0], [dnl
449449
switch <0> (ts1)
@@ -459,7 +459,7 @@ lsp-ts1-lr1,remote
459459
check ovn-nbctl lrp-set-gateway-chassis lrp-lr1-ts1 gw1
460460
OVS_WAIT_UNTIL([ovn_as az2 ovn-sbctl show | grep lsp-ts1-lr1])
461461

462-
ovn_as az2 ovn-nbctl lsp-set-options lsp-ts1-lr1 requested-chassis=""
462+
check ovn_as az2 ovn-nbctl lsp-set-options lsp-ts1-lr1 requested-chassis=""
463463
check ovn-nbctl lrp-del-gateway-chassis lrp-lr1-ts1 gw1
464464
OVS_WAIT_WHILE([ovn_as az2 ovn-sbctl show | grep lsp-ts1-lr1])
465465

@@ -528,23 +528,23 @@ Route Table <main>:
528528
])
529529

530530
# Delete route in AZ1, AZ2's learned route should be deleted.
531-
ovn_as az1 ovn-nbctl lr-route-del lr1 10.11.1.0/24
531+
check ovn_as az1 ovn-nbctl lr-route-del lr1 10.11.1.0/24
532532
ovn-ic-nbctl --wait=sb sync
533533
ovn-ic-nbctl --wait=sb sync
534534
AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep -c learned], [1], [dnl
535535
0
536536
])
537537

538538
# Add the route back
539-
ovn_as az1 ovn-nbctl lr-route-add lr1 10.11.1.0/24 169.254.0.1
539+
check ovn_as az1 ovn-nbctl lr-route-add lr1 10.11.1.0/24 169.254.0.1
540540
ovn-ic-nbctl --wait=sb sync
541541
ovn-ic-nbctl --wait=sb sync
542542
AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep -c learned], [0], [dnl
543543
1
544544
])
545545

546546
# Disable route-learning for AZ1
547-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=false
547+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=false
548548
ovn-ic-nbctl --wait=sb sync
549549
AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1], [0], [dnl
550550
IPv4 Routes
@@ -557,7 +557,7 @@ Route Table <main>:
557557
AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned], [0], [ignore])
558558

559559
# Disable route-advertising for AZ1
560-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
560+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
561561

562562
# AZ2 shouldn't have the route learned, because AZ1 should have stopped
563563
# advertising.
@@ -571,11 +571,11 @@ Route Table <main>:
571571
])
572572

573573
# Add default route in AZ1
574-
ovn_as az1 ovn-nbctl lr-route-add lr1 0.0.0.0/0 169.254.0.3
574+
check ovn_as az1 ovn-nbctl lr-route-add lr1 0.0.0.0/0 169.254.0.3
575575

576576
# Re-enable router-advertising & learn for AZ1
577-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=true
578-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=true
577+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=true
578+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=true
579579
check ovn-ic-nbctl --wait=sb sync
580580
check ovn-ic-nbctl --wait=sb sync
581581

@@ -589,39 +589,39 @@ Route Table <main>:
589589
])
590590

591591
# Enable default route advertising in AZ1
592-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv-default=true
592+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv-default=true
593593
OVS_WAIT_UNTIL([ovn-ic-sbctl list route | grep 0.0.0.0])
594594

595595
# Enable default route learning in AZ2
596-
ovn_as az2 ovn-nbctl set nb_global . options:ic-route-learn-default=true
596+
check ovn_as az2 ovn-nbctl set nb_global . options:ic-route-learn-default=true
597597
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 0.0.0.0])
598598

599599
# Test directly connected subnet route advertising.
600-
ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
600+
check ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
601601
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
602602

603603
# Delete the directly connected subnet from AZ1, learned route should be
604604
# removed from AZ2.
605-
ovn_as az1 ovn-nbctl lrp-del lrp-lr1-ls1
605+
check ovn_as az1 ovn-nbctl lrp-del lrp-lr1-ls1
606606
OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
607607

608608
# Test denylist routes
609609
# Add back the directly connected 192.168 route.
610-
ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
610+
check ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
611611
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
612612
# Ensure AZ1 learned AZ2's 10.11.2.0 route as well.
613613
OVS_WAIT_UNTIL([ovn_as az1 ovn-nbctl lr-route-list lr1 | grep learned | grep 10.11])
614614
# Now black list 10.11.0.0/16 and 192.168.0.0/16 in AZ2.
615-
ovn_as az2 ovn-nbctl set nb_global . options:ic-route-denylist="10.11.0.0/16,192.168.0.0/16"
615+
check ovn_as az2 ovn-nbctl set nb_global . options:ic-route-denylist="10.11.0.0/16,192.168.0.0/16"
616616
# AZ2 shouldn't learn 192.168 route any more.
617617
OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
618618
# AZ1 shouldn't learn 10.11 any more.
619619
OVS_WAIT_WHILE([ovn_as az1 ovn-nbctl lr-route-list lr1 | grep learned | grep 10.11])
620620

621621
# cleanup
622622
ovn-ic-nbctl --if-exists ts-del ts1
623-
ovn_as az1 ovn-nbctl lr-del lr1
624-
ovn_as az2 ovn-nbctl lr-del lr2
623+
check ovn_as az1 ovn-nbctl lr-del lr1
624+
check ovn_as az2 ovn-nbctl lr-del lr2
625625

626626
# Create new transit switches and LRs. Test topology is next:
627627
# logical router (lr11) - transit switch (ts11) - logical router (lr12)
@@ -652,9 +652,9 @@ for i in 1 2; do
652652
done
653653

654654
# Create directly-connected routes
655-
ovn_as az2 ovn-nbctl --wait=sb lrp-add lr12 lrp-lr12-ls2 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
656-
ovn_as az2 ovn-nbctl lr-route-add lr12 10.10.10.0/24 192.168.0.10
657-
ovn_as az1 ovn-nbctl --wait=sb sync
655+
check ovn_as az2 ovn-nbctl --wait=sb lrp-add lr12 lrp-lr12-ls2 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
656+
check ovn_as az2 ovn-nbctl lr-route-add lr12 10.10.10.0/24 192.168.0.10
657+
check ovn_as az1 ovn-nbctl --wait=sb sync
658658

659659
echo az1
660660
ovn_as az1 ovn-nbctl show
@@ -675,10 +675,10 @@ AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr21], [0], [])
675675

676676
# cleanup
677677
ovn-ic-nbctl --if-exists ts-del ts1
678-
ovn_as az1 ovn-nbctl lr-del lr11
679-
ovn_as az1 ovn-nbctl lr-del lr21
680-
ovn_as az2 ovn-nbctl lr-del lr12
681-
ovn_as az2 ovn-nbctl lr-del lr22
678+
check ovn_as az1 ovn-nbctl lr-del lr11
679+
check ovn_as az1 ovn-nbctl lr-del lr21
680+
check ovn_as az2 ovn-nbctl lr-del lr12
681+
check ovn_as az2 ovn-nbctl lr-del lr22
682682

683683
# check routes origin advertisement and learning
684684

@@ -1104,8 +1104,8 @@ Route Table rtb1:
11041104

11051105
# move routes from <main> route table to rtb1
11061106
for i in 1 2; do
1107-
ovn_as az$i ovn-nbctl lr-route-del lr$i 10.11.$i.0/24 169.254.0.1
1108-
ovn_as az$i ovn-nbctl --route-table=rtb1 lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
1107+
check ovn_as az$i ovn-nbctl lr-route-del lr$i 10.11.$i.0/24 169.254.0.1
1108+
check ovn_as az$i ovn-nbctl --route-table=rtb1 lr-route-add lr$i 10.11.$i.0/24 169.254.0.1
11091109
done
11101110

11111111
check ovn-ic-nbctl --wait=sb sync
@@ -1144,15 +1144,15 @@ Route Table rtb1:
11441144
])
11451145

11461146
# Delete route in AZ1, AZ2's learned route should be deleted.
1147-
ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-del lr1 10.11.1.0/24
1147+
check ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-del lr1 10.11.1.0/24
11481148
OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-list lr2 | grep learned])
11491149

11501150
# Add the route back
1151-
ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-add lr1 10.11.1.0/24 169.254.0.1
1151+
check ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-add lr1 10.11.1.0/24 169.254.0.1
11521152
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned])
11531153

11541154
# Disable route-learning for AZ1
1155-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=false
1155+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=false
11561156
OVS_WAIT_WHILE([ovn_as az1 ovn-nbctl lr-route-list lr1 | grep learned])
11571157
AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr1], [0], [dnl
11581158
IPv4 Routes
@@ -1172,17 +1172,17 @@ Route Table rtb1:
11721172
])
11731173

11741174
# Disable route-advertising for AZ1
1175-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
1175+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
11761176

11771177
# AZ2 shouldn't have the route learned, because AZ1 have stopped advertising.
11781178
OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned])
11791179

11801180
# Add default route in AZ1
1181-
ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-add lr1 0.0.0.0/0 169.254.0.3
1181+
check ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-add lr1 0.0.0.0/0 169.254.0.3
11821182

11831183
# Re-enable router-advertising & learn for AZ1
1184-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=true
1185-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=true
1184+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=true
1185+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-learn=true
11861186

11871187
for i in 1 2; do
11881188
OVS_WAIT_UNTIL([ovn_as az$i ovn-nbctl lr-route-list lr$i | grep learned])
@@ -1192,16 +1192,16 @@ done
11921192
AT_CHECK([ovn-ic-sbctl find route ip_prefix="0.0.0.0/0"], [0], [])
11931193

11941194
# Enable default route advertising in AZ1, ensure it advertised, but not learned
1195-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv-default=true
1195+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv-default=true
11961196
OVS_WAIT_UNTIL([ovn-ic-sbctl find route ip_prefix="0.0.0.0/0" route_table=rtb1 | grep 0.0.0.0])
11971197
OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-list lr2 | grep learned | grep 0.0.0.0])
11981198

11991199
# Enable default route learning in AZ2
1200-
ovn_as az2 ovn-nbctl set nb_global . options:ic-route-learn-default=true
1200+
check ovn_as az2 ovn-nbctl set nb_global . options:ic-route-learn-default=true
12011201
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-list lr2 | grep learned | grep 0.0.0.0])
12021202

12031203
# Test directly connected subnet route advertising. Route should go to <main> route table.
1204-
ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1204+
check ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
12051205
OVS_WAIT_UNTIL([ovn-ic-sbctl find route ip_prefix="192.168.0.1/24" route_table="\"\"" | grep 192.168.0.1/24])
12061206
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
12071207
AT_CHECK([ovn_as az2 ovn-nbctl lr-route-list lr2], [0], [dnl
@@ -1218,12 +1218,12 @@ Route Table rtb1:
12181218

12191219
# Delete the directly connected subnet from AZ1, learned route should be
12201220
# removed from AZ2.
1221-
ovn_as az1 ovn-nbctl lrp-del lrp-lr1-ls1
1221+
check ovn_as az1 ovn-nbctl lrp-del lrp-lr1-ls1
12221222
OVS_WAIT_WHILE([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
12231223

12241224
# Test denylist routes
12251225
# Add back the directly connected 192.168 route.
1226-
ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1226+
check ovn_as az1 ovn-nbctl lrp-add lr1 lrp-lr1-ls1 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
12271227
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl lr-route-list lr2 | grep learned | grep 192.168])
12281228
# Now add 10.11.0.0/16 and 192.168.0.0/16 to denylist in AZ2.
12291229
check ovn_as az2 ovn-nbctl set nb_global . options:ic-route-denylist="10.11.0.0/16,192.168.0.0/16"
@@ -1320,13 +1320,13 @@ for i in 1 2; do
13201320
done
13211321

13221322
# Create directly-connected and static routes in VPC1
1323-
ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1324-
ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-add lr12 10.10.10.0/24 192.168.0.10
1325-
ovn_as az2 ovn-nbctl --route-table=rtb2 lr-route-add lr12 10.10.10.0/24 192.168.0.11
1326-
ovn_as az2 ovn-nbctl --route-table=rtb3 lr-route-add lr12 10.10.10.0/24 192.168.0.12
1323+
check ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1324+
check ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-add lr12 10.10.10.0/24 192.168.0.10
1325+
check ovn_as az2 ovn-nbctl --route-table=rtb2 lr-route-add lr12 10.10.10.0/24 192.168.0.11
1326+
check ovn_as az2 ovn-nbctl --route-table=rtb3 lr-route-add lr12 10.10.10.0/24 192.168.0.12
13271327

13281328
# Create directly-connected route in VPC2
1329-
ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1329+
check ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
13301330
check ovn-ic-nbctl --wait=sb sync
13311331
check ovn-ic-nbctl --wait=sb sync
13321332
# Test direct routes from lr12 were learned to lr11
@@ -1441,13 +1441,13 @@ for i in 1 2; do
14411441
done
14421442

14431443
# Create directly-connected and static routes in VPC1
1444-
ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12 aa:aa:aa:aa:bb:01 "2001:db8:200::1/64"
1445-
ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-add lr12 2001:db8:aaaa::/64 2001:db8:200::10
1446-
ovn_as az2 ovn-nbctl --route-table=rtb2 lr-route-add lr12 2001:db8:aaaa::/64 2001:db8:200::11
1447-
ovn_as az2 ovn-nbctl --route-table=rtb3 lr-route-add lr12 2001:db8:aaaa::/64 2001:db8:200::12
1444+
check ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12 aa:aa:aa:aa:bb:01 "2001:db8:200::1/64"
1445+
check ovn_as az2 ovn-nbctl --route-table=rtb1 lr-route-add lr12 2001:db8:aaaa::/64 2001:db8:200::10
1446+
check ovn_as az2 ovn-nbctl --route-table=rtb2 lr-route-add lr12 2001:db8:aaaa::/64 2001:db8:200::11
1447+
check ovn_as az2 ovn-nbctl --route-table=rtb3 lr-route-add lr12 2001:db8:aaaa::/64 2001:db8:200::12
14481448

14491449
# Create directly-connected route in VPC2
1450-
ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bb:01 "2001:db8:200::1/64"
1450+
check ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bb:01 "2001:db8:200::1/64"
14511451

14521452
# Test direct routes from lr12 were learned to lr11
14531453
#
@@ -1596,9 +1596,9 @@ for i in 1 2; do
15961596
done
15971597

15981598
# Create directly-connected routes
1599-
ovn_as az1 ovn-nbctl lrp-add lr11 lrp-lr11 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1600-
ovn_as az2 ovn-nbctl lrp-add lr21 lrp-lr21 aa:aa:aa:aa:bc:01 "192.168.1.1/24"
1601-
ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bc:02 "192.168.2.1/24"
1599+
check ovn_as az1 ovn-nbctl lrp-add lr11 lrp-lr11 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
1600+
check ovn_as az2 ovn-nbctl lrp-add lr21 lrp-lr21 aa:aa:aa:aa:bc:01 "192.168.1.1/24"
1601+
check ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:bc:02 "192.168.2.1/24"
16021602

16031603
# Test direct routes from lr21 and lr22 were learned to lr11
16041604
check ovn-ic-nbctl --wait=sb sync
@@ -2738,10 +2738,10 @@ for i in 1 2; do
27382738
done
27392739

27402740
# Create directly-connected route in VPC1
2741-
ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
2741+
check ovn_as az2 ovn-nbctl lrp-add lr12 lrp-lr12 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
27422742

27432743
# Create directly-connected route in VPC2
2744-
ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:cc:01 "192.168.1.1/24"
2744+
check ovn_as az2 ovn-nbctl --wait=sb lrp-add lr22 lrp-lr22 aa:aa:aa:aa:cc:01 "192.168.1.1/24"
27452745

27462746
check ovn-ic-nbctl --wait=sb sync
27472747

@@ -2800,14 +2800,14 @@ OVS_WAIT_FOR_OUTPUT([ovn_as az1 ovn-nbctl lr-route-list lr21 | grep 192.168 |
28002800
])
28012801

28022802
# VPC1: Create a route tag for VPC1 mark its own routes via lrp-lr12
2803-
ovn_as az2 ovn-nbctl set logical_router_port lrp-lr12-tspeer options:ic-route-tag=vpc1
2803+
check ovn_as az2 ovn-nbctl set logical_router_port lrp-lr12-tspeer options:ic-route-tag=vpc1
28042804

28052805
# Test advertised routes with the vpc1 route tag present
28062806
ovn-ic-sbctl list route
28072807
wait_row_count ic-sb:Route 1 ip_prefix=192.168.0.1/24 nexthop=169.254.103.12 origin=connected external_ids:ic-route-tag=vpc1
28082808

28092809
# Filter routes on VPC1 lrp-lr11-tspeer with the route tag vpc1 present
2810-
ovn_as az1 ovn-nbctl set logical_router_port lrp-lr11-tspeer options:ic-route-filter-tag=vpc1
2810+
check ovn_as az1 ovn-nbctl set logical_router_port lrp-lr11-tspeer options:ic-route-filter-tag=vpc1
28112811

28122812
# Test remaining direct routes from lr12 were learned to lr11
28132813
# Routes from the 169.254.101.2 nexthop have been filtered
@@ -2819,7 +2819,7 @@ OVS_WAIT_FOR_OUTPUT([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep 192.168 |
28192819
])
28202820

28212821
# Remove the route tag used for advertisement
2822-
ovn_as az2 ovn-nbctl remove logical_router_port lrp-lr12-tspeer options ic-route-tag=vpc1
2822+
check ovn_as az2 ovn-nbctl remove logical_router_port lrp-lr12-tspeer options ic-route-tag=vpc1
28232823

28242824
# Test advertised routes with the vpc1 route tag present
28252825
ovn-ic-sbctl list route
@@ -2835,8 +2835,8 @@ OVS_WAIT_FOR_OUTPUT([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep 192.168 |
28352835
])
28362836

28372837
# Remove route tag filter and add route tag on lrp-lr12-tspeer advertised routes
2838-
ovn_as az1 ovn-nbctl remove logical_router_port lrp-lr11-tspeer options ic-route-filter-tag=vpc1
2839-
ovn_as az2 ovn-nbctl set logical_router_port lrp-lr12-tspeer options:ic-route-tag=vpc1
2838+
check ovn_as az1 ovn-nbctl remove logical_router_port lrp-lr11-tspeer options ic-route-filter-tag=vpc1
2839+
check ovn_as az2 ovn-nbctl set logical_router_port lrp-lr12-tspeer options:ic-route-tag=vpc1
28402840

28412841
# Test if all the routes are learned because we no longer have the filter tag option enabled
28422842
OVS_WAIT_FOR_OUTPUT([ovn_as az1 ovn-nbctl lr-route-list lr11 | grep 192.168 |

0 commit comments

Comments
 (0)