Skip to content

Commit a1b7c8d

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 332e32d commit a1b7c8d

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"
@@ -442,7 +442,7 @@ check ovn-nbctl lr-add lr1
442442
check ovn-nbctl lrp-add lr1 lrp-lr1-ts1 aa:aa:aa:aa:aa:01 169.254.100.1/24
443443
check ovn-nbctl --wait=hv lsp-add-router-port ts1 lsp-ts1-lr1 lrp-lr1-ts1
444444
OVS_WAIT_UNTIL([ovn_as az2 ovn-nbctl show | grep lsp-ts1-lr1])
445-
ovn_as az2 ovn-nbctl lsp-set-options lsp-ts1-lr1 requested-chassis=gw1
445+
check ovn_as az2 ovn-nbctl lsp-set-options lsp-ts1-lr1 requested-chassis=gw1
446446

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

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

@@ -527,23 +527,23 @@ Route Table <main>:
527527
])
528528

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

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

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

558558
# Disable route-advertising for AZ1
559-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
559+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
560560

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

572572
# Add default route in AZ1
573-
ovn_as az1 ovn-nbctl lr-route-add lr1 0.0.0.0/0 169.254.0.3
573+
check ovn_as az1 ovn-nbctl lr-route-add lr1 0.0.0.0/0 169.254.0.3
574574

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

@@ -588,39 +588,39 @@ Route Table <main>:
588588
])
589589

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

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

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

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

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

620620
# cleanup
621621
ovn-ic-nbctl --if-exists ts-del ts1
622-
ovn_as az1 ovn-nbctl lr-del lr1
623-
ovn_as az2 ovn-nbctl lr-del lr2
622+
check ovn_as az1 ovn-nbctl lr-del lr1
623+
check ovn_as az2 ovn-nbctl lr-del lr2
624624

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

653653
# Create directly-connected routes
654-
ovn_as az2 ovn-nbctl --wait=sb lrp-add lr12 lrp-lr12-ls2 aa:aa:aa:aa:bb:01 "192.168.0.1/24"
655-
ovn_as az2 ovn-nbctl lr-route-add lr12 10.10.10.0/24 192.168.0.10
656-
ovn_as az1 ovn-nbctl --wait=sb sync
654+
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"
655+
check ovn_as az2 ovn-nbctl lr-route-add lr12 10.10.10.0/24 192.168.0.10
656+
check ovn_as az1 ovn-nbctl --wait=sb sync
657657

658658
echo az1
659659
ovn_as az1 ovn-nbctl show
@@ -674,10 +674,10 @@ AT_CHECK([ovn_as az1 ovn-nbctl lr-route-list lr21], [0], [])
674674

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

682682
# check routes origin advertisement and learning
683683

@@ -1103,8 +1103,8 @@ Route Table rtb1:
11031103

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

11101110
check ovn-ic-nbctl --wait=sb sync
@@ -1143,15 +1143,15 @@ Route Table rtb1:
11431143
])
11441144

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

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

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

11731173
# Disable route-advertising for AZ1
1174-
ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
1174+
check ovn_as az1 ovn-nbctl set nb_global . options:ic-route-adv=false
11751175

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

11791179
# Add default route in AZ1
1180-
ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-add lr1 0.0.0.0/0 169.254.0.3
1180+
check ovn_as az1 ovn-nbctl --route-table=rtb1 lr-route-add lr1 0.0.0.0/0 169.254.0.3
11811181

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

28042804
# Test advertised routes with the vpc1 route tag present
28052805
ovn-ic-sbctl list route
28062806
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
28072807

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

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

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

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

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

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

0 commit comments

Comments
 (0)