Merge branch 'main' into vishnureddybadveli-patch-4

.github/CODEOWNERS

@@ -16,7 +16,7 @@
 /feature/bgp/          @openconfig/featureprofiles-owner-bgp
 /feature/dhcp/         @alokmtri-g
 /feature/ethernet/     @ram-mac
-/feature/gribi/        @nflath @nachikethas @xw-g
+/feature/gribi/        @openconfig/featureprofiles-owner-gribi
 /feature/interface/    @openconfig/featureprofiles-owner-interface
 /feature/isis/         @openconfig/featureprofiles-owner-isis
 /feature/lldp/         @openconfig/featureprofiles-owner-lldp

feature/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/bgp_isis_redistribution_test.go

@@ -314,7 +314,9 @@ func nonMatchingPrefixRoutePolicy(t *testing.T, dut *ondatra.DUTDevice) {
 	}
 
 	prefixSet := rp.GetOrCreateDefinedSets().GetOrCreatePrefixSet(v4PrefixSet)
-	prefixSet.SetMode(oc.PrefixSet_Mode_IPV4)
+	if !deviations.SkipPrefixSetMode(dut) {
+		prefixSet.SetMode(oc.PrefixSet_Mode_IPV4)
+	}
 	prefixSet.GetOrCreatePrefix(nonAdvertisedIPv4.cidr(t), maskLenExact)
 
 	if !deviations.SkipSetRpMatchSetOptions(dut) {
@@ -330,7 +332,7 @@ func matchingPrefixRoutePolicy(t *testing.T, dut *ondatra.DUTDevice) {
 	rp := root.GetOrCreateRoutingPolicy()
 	prefixSet := rp.GetOrCreateDefinedSets().GetOrCreatePrefixSet(v4PrefixSet)
 	prefixSet.GetOrCreatePrefix(advertisedIPv4.cidr(t), maskLenExact)
-	gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().PrefixSet(v4PrefixSet).Config(), prefixSet)
+	gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().PrefixSet(v4PrefixSet).Config(), prefixSet)
 }
 
 func nonMatchingCommunityRoutePolicy(t *testing.T, dut *ondatra.DUTDevice) {
@@ -355,12 +357,14 @@ func nonMatchingCommunityRoutePolicy(t *testing.T, dut *ondatra.DUTDevice) {
 
 		communitySet := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets().GetOrCreateCommunitySet(v4CommunitySet)
 		communitySet.SetCommunityMember([]oc.RoutingPolicy_DefinedSets_BgpDefinedSets_CommunitySet_CommunityMember_Union{oc.UnionString(fmt.Sprintf("%d:%d", dummyAS, 200))})
-		communitySet.SetMatchSetOptions(oc.BgpPolicy_MatchSetOptionsType_ANY)
 
 		if deviations.BGPConditionsMatchCommunitySetUnsupported(dut) {
+			communitySet.SetMatchSetOptions(oc.BgpPolicy_MatchSetOptionsType_ANY)
 			stmt.GetOrCreateConditions().GetOrCreateBgpConditions().SetCommunitySet(v4CommunitySet)
 		} else {
-			stmt.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet().SetCommunitySet(v4CommunitySet)
+			ref1 := stmt.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet()
+			ref1.SetCommunitySet(v4CommunitySet)
+			ref1.SetMatchSetOptions(oc.RoutingPolicy_MatchSetOptionsType_ANY)
 		}
 		// Configure ALLOWAll policy
 		pdef = rp.GetOrCreatePolicyDefinition(allowAllPolicy)
@@ -383,7 +387,7 @@ func matchingCommunityRoutePolicy(t *testing.T, dut *ondatra.DUTDevice) {
 		rp := root.GetOrCreateRoutingPolicy()
 		communitySet := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets().GetOrCreateCommunitySet(v4CommunitySet)
 		communitySet.SetCommunityMember([]oc.RoutingPolicy_DefinedSets_BgpDefinedSets_CommunitySet_CommunityMember_Union{oc.UnionString(fmt.Sprintf("%d:%d", ateAS, 100))})
-		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().BgpDefinedSets().CommunitySet(v4CommunitySet).Config(), communitySet)
+		gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().BgpDefinedSets().CommunitySet(v4CommunitySet).Config(), communitySet)
 	}
 }
 
@@ -410,8 +414,10 @@ func verifyNonMatchingPrefixTelemetry(t *testing.T, dut *ondatra.DUTDevice, ate
 	if pName := prefixSet.GetName(); pName != v4PrefixSet {
 		t.Errorf("Prefix set name: %s, want: %s", pName, v4PrefixSet)
 	}
-	if pMode := prefixSet.GetMode(); pMode != oc.PrefixSet_Mode_IPV4 {
-		t.Errorf("Prefix set mode: %s, want: %s", pMode, oc.PrefixSet_Mode_IPV4)
+	if !deviations.SkipPrefixSetMode(dut) {
+		if pMode := prefixSet.GetMode(); pMode != oc.PrefixSet_Mode_IPV4 {
+			t.Errorf("Prefix set mode: %s, want: %s", pMode, oc.PrefixSet_Mode_IPV4)
+		}
 	}
 	if prefix := prefixSet.GetPrefix(nonAdvertisedIPv4.cidr(t), maskLenExact); prefix == nil {
 		t.Errorf("Prefix is nil, want: %s", nonAdvertisedIPv4.cidr(t))
@@ -525,7 +531,9 @@ func nonMatchingPrefixRoutePolicyV6(t *testing.T, dut *ondatra.DUTDevice) {
 	}
 
 	prefixSet := rp.GetOrCreateDefinedSets().GetOrCreatePrefixSet(v6PrefixSet)
-	prefixSet.SetMode(oc.PrefixSet_Mode_IPV6)
+	if !deviations.SkipPrefixSetMode(dut) {
+		prefixSet.SetMode(oc.PrefixSet_Mode_IPV6)
+	}
 	prefixSet.GetOrCreatePrefix(nonAdvertisedIPv6.cidr(t), maskLenExact)
 
 	if !deviations.SkipSetRpMatchSetOptions(dut) {
@@ -540,7 +548,7 @@ func matchingPrefixRoutePolicyV6(t *testing.T, dut *ondatra.DUTDevice) {
 	rp := root.GetOrCreateRoutingPolicy()
 	prefixSet := rp.GetOrCreateDefinedSets().GetOrCreatePrefixSet(v6PrefixSet)
 	prefixSet.GetOrCreatePrefix(advertisedIPv6.cidr(t), maskLenExact)
-	gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().PrefixSet(v6PrefixSet).Config(), prefixSet)
+	gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().PrefixSet(v6PrefixSet).Config(), prefixSet)
 }
 
 func nonMatchingCommunityRoutePolicyV6(t *testing.T, dut *ondatra.DUTDevice) {
@@ -565,12 +573,14 @@ func nonMatchingCommunityRoutePolicyV6(t *testing.T, dut *ondatra.DUTDevice) {
 
 		communitySet := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets().GetOrCreateCommunitySet(v6CommunitySet)
 		communitySet.SetCommunityMember([]oc.RoutingPolicy_DefinedSets_BgpDefinedSets_CommunitySet_CommunityMember_Union{oc.UnionString(fmt.Sprintf("%d:%d", dummyAS, 200))})
-		communitySet.SetMatchSetOptions(oc.BgpPolicy_MatchSetOptionsType_ANY)
 
 		if deviations.BGPConditionsMatchCommunitySetUnsupported(dut) {
 			stmt.GetOrCreateConditions().GetOrCreateBgpConditions().SetCommunitySet(v6CommunitySet)
+			communitySet.SetMatchSetOptions(oc.BgpPolicy_MatchSetOptionsType_ANY)
 		} else {
-			stmt.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet().SetCommunitySet(v6CommunitySet)
+			ref1 := stmt.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet()
+			ref1.SetCommunitySet(v6CommunitySet)
+			ref1.SetMatchSetOptions(oc.RoutingPolicy_MatchSetOptionsType_ANY)
 		}
 		// Configure ALLOWAll policy
 		pdef = rp.GetOrCreatePolicyDefinition(allowAllPolicy)
@@ -592,7 +602,7 @@ func matchingCommunityRoutePolicyV6(t *testing.T, dut *ondatra.DUTDevice) {
 		rp := root.GetOrCreateRoutingPolicy()
 		communitySet := rp.GetOrCreateDefinedSets().GetOrCreateBgpDefinedSets().GetOrCreateCommunitySet(v6CommunitySet)
 		communitySet.SetCommunityMember([]oc.RoutingPolicy_DefinedSets_BgpDefinedSets_CommunitySet_CommunityMember_Union{oc.UnionString(fmt.Sprintf("%d:%d", ateAS, 100))})
-		gnmi.Update(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().BgpDefinedSets().CommunitySet(v6CommunitySet).Config(), communitySet)
+		gnmi.Replace(t, dut, gnmi.OC().RoutingPolicy().DefinedSets().BgpDefinedSets().CommunitySet(v6CommunitySet).Config(), communitySet)
 	}
 }
 
@@ -619,8 +629,10 @@ func verifyNonMatchingPrefixTelemetryV6(t *testing.T, dut *ondatra.DUTDevice, at
 	if pName := prefixSet.GetName(); pName != v6PrefixSet {
 		t.Errorf("Prefix set name: %s, want: %s", pName, v6PrefixSet)
 	}
-	if pMode := prefixSet.GetMode(); pMode != oc.PrefixSet_Mode_IPV6 {
-		t.Errorf("Prefix set mode: %s, want: %s", pMode, oc.PrefixSet_Mode_IPV6)
+	if !deviations.SkipPrefixSetMode(dut) {
+		if pMode := prefixSet.GetMode(); pMode != oc.PrefixSet_Mode_IPV6 {
+			t.Errorf("Prefix set mode: %s, want: %s", pMode, oc.PrefixSet_Mode_IPV6)
+		}
 	}
 	if prefix := prefixSet.GetPrefix(nonAdvertisedIPv6.cidr(t), maskLenExact); prefix == nil {
 		t.Errorf("Prefix is nil, want: %s", nonAdvertisedIPv6.cidr(t))
@@ -718,6 +730,9 @@ func verifyMatchingCommunityTelemetryV6(t *testing.T, dut *ondatra.DUTDevice, at
 func bgpISISRedistribution(t *testing.T, dut *ondatra.DUTDevice, operation string) {
 	dni := deviations.DefaultNetworkInstance(dut)
 	root := &oc.Root{}
+	if deviations.EnableTableConnections(dut) {
+		fptest.ConfigEnableTbNative(t, dut)
+	}
 	tableConn := root.GetOrCreateNetworkInstance(dni).GetOrCreateTableConnection(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS, oc.Types_ADDRESS_FAMILY_IPV4)
 	if operation == "set" {
 		if !deviations.SkipSettingDisableMetricPropagation(dut) {
@@ -736,6 +751,9 @@ func bgpISISRedistribution(t *testing.T, dut *ondatra.DUTDevice, operation strin
 func bgpISISRedistributionV6(t *testing.T, dut *ondatra.DUTDevice, operation string) {
 	dni := deviations.DefaultNetworkInstance(dut)
 	root := &oc.Root{}
+	if deviations.EnableTableConnections(dut) {
+		fptest.ConfigEnableTbNative(t, dut)
+	}
 	tableConn := root.GetOrCreateNetworkInstance(dni).GetOrCreateTableConnection(oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_BGP, oc.PolicyTypes_INSTALL_PROTOCOL_TYPE_ISIS, oc.Types_ADDRESS_FAMILY_IPV6)
 	if operation == "set" {
 		if !deviations.SkipSettingDisableMetricPropagation(dut) {

feature/bgp/bgp_isis_redistribution/otg_tests/bgp_isis_redistribution_test/metadata.textproto

@@ -44,3 +44,14 @@ platform_exceptions: {
     default_route_policy_unsupported: true
   }
 }
+platform_exceptions: {
+  platform: {
+    vendor: NOKIA
+  }
+  deviations: {
+  explicit_interface_in_default_vrf: true
+  interface_enabled: true
+  skip_prefix_set_mode: true
+  enable_table_connections: true
+  }
+}

feature/bgp/prefixlimit/otg_tests/bgp_prefix_limit_test/README.md

@@ -6,7 +6,7 @@ BGP Prefix Limit
 
 ## Procedure
 
-*   Configure eBGP session between ATE port-1 and DUT port-1,with an Accept-route all import-policy/export-policy under the neighbor AFI/SAFI.
+*   Configure eBGP session between ATE port-1 and DUT port-1,with an Accept-route all import-policy/export-policy under the BGP peer-group AFI/SAFI.
 *   With maximum prefix limits of unlimited, and N.
     *   Advertise prefixes of `limit - 1`, `limit`, `limit + 1`. Validate
         session state meets expected value at ATE.
@@ -20,31 +20,22 @@ BGP Prefix Limit
     table by forwarding traffic to `prefix{0..n-1}` and `prefix{n}` where n is
     the maximum prefix limit configured.
 
-## Config Parameter coverage
-
-For prefixes:
-
-*   /network-instances/network-instance/protocols/protocol/bgp/peer-groups/peer-group/
-*   /network-instances/network-instance/protocols/protocol/bgp/neighbors/neighbor
-
-Parameters:
-
-*   afi-safis/afi-safi/ipv4-unicast/prefix-limit/config/max-prefixes
-*   afi-safis/afi-safi/ipv4-unicast/prefix-limit/config/restart-timer
-
-## Telemetry Parameter coverage
-
-*   TODO: afi-safis/afi-safi/ipv\[46\]-unicast/prefix-limit/state/restart-timer
-*   TODO:
-    afi-safis/afi-safi/ipv\[46\]-unicast/prefix-limit/state/warning-threshold-pct
-*   TODO:
-    afi-safis/afi-safi/ipv\[46\]-unicast/prefix-limit/state/max-prefix-limit
-*   TODO:
-    afi-safis/afi-safi/ipv\[46\]-unicast/prefix-limit/state/prefix-limit-exceeded
-
-## Protocol/RPC Parameter coverage
-
-N/A
+## OpenConfig Path and RPC Coverage
+
+```yaml
+paths:
+  /network-instances/network-instance/protocols/protocol/bgp/peer-groups/peer-group/state/peer-group-name:
+  /network-instances/network-instance/protocols/protocol/bgp/neighbors/neighbor/state/neighbor-address:
+  /network-instances/network-instance/protocols/protocol/bgp/peer-groups/peer-group/afi-safis/afi-safi/ipv4-unicast/prefix-limit/config/max-prefixes:
+  /network-instances/network-instance/protocols/protocol/bgp/peer-groups/peer-group/afi-safis/afi-safi/ipv4-unicast/prefix-limit/state/warning-threshold-pct:
+  /network-instances/network-instance/protocols/protocol/bgp/peer-groups/peer-group/afi-safis/afi-safi/ipv4-unicast/prefix-limit/state/prefix-limit-exceeded:
+
+rpcs:
+  gnmi:
+    gNMI.Get:
+    gNMI.Subscribe:
+    gNMI.Set:
+```
 
 ## Minimum DUT platform requirement
 

feature/bgp/tests/local_bgp_test/README.md

@@ -8,7 +8,7 @@ The local\_bgp\_test brings up two OpenConfig controlled devices and tests that
 * Disconnected between them.
 * Verify BGP neighbor parameters
 
-Enable an Accept-route all import-policy/export-policy for eBGP session under the neighbor AFI/SAFI.
+Enable an Accept-route all import-policy/export-policy for eBGP session under the BGP peer-group AFI/SAFI.
 
 
 This test is suitable for running in a KNE environment.

feature/bgp/timers/otg_tests/bgp_keepalive_and_holdtimer_configuration_test/README.md

@@ -8,7 +8,7 @@ BGP Keepalive and HoldTimer Configuration Test
 
 *   Establish eBGP sessions as follows between ATE and DUT
     * The DUT has eBGP peering with ATE port 1 and ATE port 2.
-    * Enable an Accept-route all import-policy/export-policy under the neighbor AFI/SAFI.
+    * Enable an Accept-route all import-policy/export-policy under the BGP peer-group AFI/SAFI.
     * The first pair is called the "source" pair, and the second the "destination" pair
 
 *  Validate BGP session state on DUT using telemetry.

feature/gnoi/factory_reset/tests/factory_reset_test/factory_reset_test.go

@@ -36,7 +36,7 @@ import (
 
 var (
 	remoteFilePath = map[ondatra.Vendor]string{
-		ondatra.CISCO:   "/misc/disk1/",
+		ondatra.CISCO:   "harddisk:/",
 		ondatra.NOKIA:   "/tmp/",
 		ondatra.JUNIPER: "/var/tmp/",
 		ondatra.ARISTA:  "/mnt/flash/",

feature/gribi/otg_tests/get_rpc_test/README.md

@@ -48,18 +48,14 @@ Validate gRIBI Get RPC.
 [fib_status]: https://github.com/openconfig/gribi/blob/08d53dffce45e942c6e7f07521c58b557984e4b7/v1/proto/service/gribi.proto#L485
 [rib_status]: https://github.com/openconfig/gribi/blob/08d53dffce45e942c6e7f07521c58b557984e4b7/v1/proto/service/gribi.proto#L483
 
-## Config Parameter coverage
-
-No additional configuration parameters.
-
-## Telemetry Parameter coverage
-
-No additional telemetry parameters.
-
-## Protocol/RPC Parameter coverage
-
-*   gRIBI
-    *   Get
+## OpenConfig Path and RPC Coverage
+
+```yaml
+rpcs:
+  gnmi:
+    gNMI.Get:
+    gNMI.Set:
+```
 
 ## Minimum DUT platform requirement
 

feature/gribi/otg_tests/get_rpc_test/get_rpc_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/openconfig/ondatra"
 	"github.com/openconfig/ondatra/gnmi"
 	"github.com/openconfig/ondatra/gnmi/oc"
+	"github.com/openconfig/ygnmi/ygnmi"
 	"github.com/openconfig/ygot/ygot"
 )
 
@@ -316,8 +317,17 @@ func testIPv4LeaderActive(ctx context.Context, t *testing.T, args *testArgs) {
 	// Verify the above entries are active through AFT Telemetry.
 	for ip := range ateDstNetCIDR {
 		ipv4Path := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Afts().Ipv4Entry(ateDstNetCIDR[ip])
-		if got, want := gnmi.Get(t, args.dut, ipv4Path.State()).GetPrefix(), ateDstNetCIDR[ip]; got != want {
-			t.Errorf("ipv4-entry/state/prefix got %s, want %s", got, want)
+		lastValue, ok := gnmi.Watch(t, args.dut, ipv4Path.State(), time.Minute, func(v *ygnmi.Value[*oc.NetworkInstance_Afts_Ipv4Entry]) bool {
+			return v.IsPresent()
+		}).Await(t)
+
+		if !ok {
+			t.Fatalf("gnmi.Watch() failed value received = %s", lastValue)
+		}
+
+		ipv4, _ := lastValue.Val()
+		if got, want := ipv4.GetPrefix(), ateDstNetCIDR[ip]; got != want {
+			t.Fatalf("ipv4-entry/state/prefix got %s, want %s", got, want)
 		}
 	}
 
@@ -346,8 +356,17 @@ func testIPv4LeaderActive(ctx context.Context, t *testing.T, args *testArgs) {
 	validateGetRPC(ctx, t, args.clientA)
 	for ip := range ateDstNetCIDR {
 		ipv4Path := gnmi.OC().NetworkInstance(deviations.DefaultNetworkInstance(args.dut)).Afts().Ipv4Entry(ateDstNetCIDR[ip])
-		if got, want := gnmi.Get(t, args.dut, ipv4Path.State()).GetPrefix(), ateDstNetCIDR[ip]; got != want {
-			t.Errorf("ipv4-entry/state/prefix got %s, want %s", got, want)
+		lastValue, ok := gnmi.Watch(t, args.dut, ipv4Path.State(), time.Minute, func(v *ygnmi.Value[*oc.NetworkInstance_Afts_Ipv4Entry]) bool {
+			return v.IsPresent()
+		}).Await(t)
+
+		if !ok {
+			t.Fatalf("gnmi.Watch() failed value received = %s", lastValue)
+		}
+
+		ipv4, _ := lastValue.Val()
+		if got, want := ipv4.GetPrefix(), ateDstNetCIDR[ip]; got != want {
+			t.Fatalf("ipv4-entry/state/prefix got %s, want %s", got, want)
 		}
 	}
 

feature/gribi/otg_tests/route_removal_non_default_vrf_test/route_removal_non_default_vrf_test.go

@@ -400,7 +400,7 @@ func injectEntries(ctx context.Context, t *testing.T, dut *ondatra.DUTDevice, cl
 	t.Logf("Add an IPv4Entry for %s pointing to ATE port-2 via gRIBI client", ateDstNetCIDR)
 	client.AddNH(t, nhIndex, atePort2.IPv4, deviations.DefaultNetworkInstance(dut), fluent.InstalledInRIB)
 	client.AddNHG(t, nhgIndex, map[uint64]uint64{nhIndex: 1}, deviations.DefaultNetworkInstance(dut), fluent.InstalledInRIB)
-	client.AddIPv4(t, ateDstNetCIDR, nhgIndex, networkInstanceName, deviations.DefaultNetworkInstance(dut), fluent.InstalledInRIB)
+	injectIPEntry(ctx, t, dut, client, networkInstanceName, ateDstNetCIDR)
 }
 
 // injectIPEntry adds only IPv4 entry to the specified network instance referencing to the nhgid, to the VRF.

feature/staticroute/otg_tests/basic_static_route_support_test/basic_static_route_support_test.go

@@ -44,8 +44,8 @@ const (
 	trafficDuration         = 2 * time.Minute
 	lossTolerance           = float64(1)
 	ecmpTolerance           = uint64(2)
-	port1Tag                = "0x101"
-	port2Tag                = "0x102"
+	port1Tag                = "0x01"
+	port2Tag                = "0x02"
 	dummyV6                 = "2001:db8::192:0:2:d"
 	dummyMAC                = "00:1A:11:00:0A:BC"
 	explicitMetricTolerance = float64(2)
@@ -1265,7 +1265,7 @@ func (td *testData) configureOTGFlows(t *testing.T) {
 
 	eth := v4F.EgressPacket().Add().Ethernet()
 	ethTag := eth.Dst().MetricTags().Add()
-	ethTag.SetName("MACTrackingv4").SetOffset(36).SetLength(12)
+	ethTag.SetName("MACTrackingv4").SetOffset(40).SetLength(8)
 
 	v6F := td.top.Flows().Add()
 	v6F.SetName(v6Flow).Metrics().SetEnable(true)
@@ -1284,7 +1284,7 @@ func (td *testData) configureOTGFlows(t *testing.T) {
 
 	eth = v6F.EgressPacket().Add().Ethernet()
 	ethTag = eth.Dst().MetricTags().Add()
-	ethTag.SetName("MACTrackingv6").SetOffset(36).SetLength(12)
+	ethTag.SetName("MACTrackingv6").SetOffset(40).SetLength(8)
 }
 
 func (td *testData) awaitISISAdjacency(t *testing.T, p *ondatra.Port, isisName string) error {

internal/deviations/deviations.go

@@ -1234,11 +1234,6 @@ func BgpAfiSafiWildcardNotSupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetBgpAfiSafiWildcardNotSupported()
 }
 
-// EnableTableConnections Admin Enable Table Connections in SRL native
-func EnableTableConnections(dut *ondatra.DUTDevice) bool {
-	return lookupDUTDeviations(dut).GetEnableTableConnections()
-}
-
 // NoZeroSuppression returns true if device wants to remove zero suppression
 func NoZeroSuppression(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetNoZeroSuppression()
@@ -1265,7 +1260,12 @@ func BgpSetMedV7Unsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetBgpSetMedV7Unsupported()
 }
 
+// EnableTableConnections returns true if admin state of tableconnections needs to be enabled in SRL native model
+func EnableTableConnections(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetEnableTableConnections()
+}
+
 // GribiEncapHeaderUnsupported returns true if gribi encap header is unsupported
 func GribiEncapHeaderUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetGribiEncapHeaderUnsupported()
-}
+}