@@ -503,15 +503,14 @@ func (suite *OvnClientTestSuite) testCreateGatewayACL() {
503503 checkACL (parent , ovnnb .ACLDirectionFromLport , util .EgressAllowPriority , match , map [string ]string {
504504 "apply-after-lb" : "true" ,
505505 })
506- }
507- }
508506
509- expectICMPv6 := func (parent any ) {
510- match := "icmp6"
511- checkACL (parent , ovnnb .ACLDirectionFromLport , util .EgressAllowPriority , match , map [string ]string {
512- "apply-after-lb" : "true" ,
513- })
514- checkACL (parent , ovnnb .ACLDirectionToLport , util .IngressAllowPriority , match , nil )
507+ if ipSuffix == "ip6" {
508+ match = "nd || nd_ra || nd_rs"
509+ checkACL (parent , ovnnb .ACLDirectionFromLport , util .EgressAllowPriority , match , map [string ]string {
510+ "apply-after-lb" : "true" ,
511+ })
512+ }
513+ }
515514 }
516515
517516 t .Run ("add acl to pg" , func (t * testing.T ) {
@@ -531,10 +530,9 @@ func (suite *OvnClientTestSuite) testCreateGatewayACL() {
531530
532531 pg , err := nbClient .GetPortGroup (pgName , false )
533532 require .NoError (t , err )
534- require .Len (t , pg .ACLs , 6 )
533+ require .Len (t , pg .ACLs , 5 )
535534
536535 expect (pg , gateway )
537- expectICMPv6 (pg )
538536 })
539537
540538 t .Run ("gateway's protocol is dual with u2oInterconnectionIP" , func (t * testing.T ) {
@@ -552,7 +550,7 @@ func (suite *OvnClientTestSuite) testCreateGatewayACL() {
552550
553551 pg , err := nbClient .GetPortGroup (pgName , false )
554552 require .NoError (t , err )
555- require .Len (t , pg .ACLs , 10 )
553+ require .Len (t , pg .ACLs , 9 )
556554
557555 expect (pg , gateway )
558556 expect (pg , u2oInterconnectionIP )
@@ -612,12 +610,12 @@ func (suite *OvnClientTestSuite) testCreateGatewayACL() {
612610
613611 pg , err := nbClient .GetPortGroup (pgName , false )
614612 require .NoError (t , err )
615- require .Len (t , pg .ACLs , 4 )
613+ require .Len (t , pg .ACLs , 3 )
616614
617615 expect (pg , gateway )
618616 })
619617
620- t .Run ("gateway's protocol is ipv6 with u2oInterconnectionIP " , func (t * testing.T ) {
618+ t .Run ("gateway's protocol is ipv6" , func (t * testing.T ) {
621619 t .Parallel ()
622620
623621 pgName := "test_create_gw_acl_pg_v6_u2oInterconnectionIP"
@@ -632,11 +630,10 @@ func (suite *OvnClientTestSuite) testCreateGatewayACL() {
632630
633631 pg , err := nbClient .GetPortGroup (pgName , false )
634632 require .NoError (t , err )
635- require .Len (t , pg .ACLs , 6 )
633+ require .Len (t , pg .ACLs , 5 )
636634
637635 expect (pg , gateway )
638636 expect (pg , u2oInterconnectionIP )
639- expectICMPv6 (pg )
640637 })
641638 })
642639
@@ -657,10 +654,9 @@ func (suite *OvnClientTestSuite) testCreateGatewayACL() {
657654
658655 ls , err := nbClient .GetLogicalSwitch (lsName , false )
659656 require .NoError (t , err )
660- require .Len (t , ls .ACLs , 6 )
657+ require .Len (t , ls .ACLs , 5 )
661658
662659 expect (ls , gateway )
663- expectICMPv6 (ls )
664660 })
665661 })
666662
0 commit comments