Merge branch 'main' into MGT-1

Author: priyaranjannanda

.github/workflows/test_gap_analysis.yaml

@@ -1,4 +1,3 @@
-# .github/workflows/test_gap_analysis.yaml
 name: FNT Gap Analysis
 
 on:
@@ -10,29 +9,36 @@ permissions: {}
 jobs:
   gap_analysis_test:
     runs-on: ubuntu-latest
+    env:
+      GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
     permissions:
       contents: read
       pull-requests: read
     steps:
+      - name: Show skip message
+        if: ${{ env.GEMINI_API_KEY == '' }}
+        run: echo "No access to Gemini, skipping test."
       - name: Checkout code
+        if: ${{ env.GEMINI_API_KEY != '' }}
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Needed for changed-files action to diff against base branch
 
       - name: Set up Go
+        if: ${{ env.GEMINI_API_KEY != '' }}
         uses: actions/setup-go@v5
         with:
           go-version: '1.21'
 
       - name: Get changed files
+        if: ${{ env.GEMINI_API_KEY != '' }}
         id: changed-files-pr
         uses: tj-actions/changed-files@v44
         with:
           separator: ','
 
       - name: Run Gap Analysis Script
-        env:
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+        if: ${{ env.GEMINI_API_KEY != '' }}
         run: |
           echo "--- Building and Running FNT Gap Analysis ---"
           go build -o gap-analyzer tools/gap-analyzer/read_fnttests.go

feature/acl/otg_tests/acl_large_scale/acl_large_scale_test.go

@@ -918,7 +918,7 @@ func testv4AddressScale(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDe
 	}
 
 	for _, acl := range aclConfigs {
-		if deviations.ConfigAclOcUnsupported(dut) {
+		if deviations.ConfigACLOcUnsupported(dut) {
 			switch dut.Vendor() {
 			case ondatra.ARISTA:
 				aclTarfficPolicy := cfgplugins.ACLTrafficPolicyParams{
@@ -945,7 +945,7 @@ func testv4AddressScale(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDe
 	}
 
 	// Verification of ACL on interfaces as Ingress & Egress
-	if !deviations.ConfigAclOcUnsupported(dut) {
+	if !deviations.ConfigACLOcUnsupported(dut) {
 		var expectedACLs = []struct {
 			Name    string
 			Ingress bool
@@ -1152,7 +1152,7 @@ func testv6AddressScale(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDe
 	}
 
 	for _, acl := range aclConfigs {
-		if deviations.ConfigAclOcUnsupported(dut) {
+		if deviations.ConfigACLOcUnsupported(dut) {
 			switch dut.Vendor() {
 			case ondatra.ARISTA:
 				aclTarfficPolicy := cfgplugins.ACLTrafficPolicyParams{
@@ -1179,7 +1179,7 @@ func testv6AddressScale(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDe
 	}
 
 	// Verify ACL is applied on the interfaces
-	if !deviations.ConfigAclOcUnsupported(dut) {
+	if !deviations.ConfigACLOcUnsupported(dut) {
 		var expectedACLs = []struct {
 			Name    string
 			Ingress bool
@@ -1317,7 +1317,7 @@ func testv6AddressScale(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDe
 }
 
 func testv4PrefixList(t *testing.T, dut *ondatra.DUTDevice, ate *ondatra.ATEDevice, otgConfig *otg.OTG, config gosnappi.Config) {
-	if !deviations.ConfigAclOcUnsupported(dut) {
+	if !deviations.ConfigACLOcUnsupported(dut) {
 		// Remove the ACL configs from interface
 		removeAClOnInterface(t, dut, "port1")
 		removeAClOnInterface(t, dut, "port2")