Wifi 13777 (#968)

* Removed performance marker from peak_throughput_tests for twog and fiveg, Added AX_capacity testplan in performance for twog and fiveg Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added pass_fail_criteria argument Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Removed performance marker from bidirectional test cases Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Removed ow_sanity_lf marker from schema validation (#940) Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * add roam otd twog same channel wpa3 eap test (#941) Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * add roam otd fiveg wpa3eap test (#942) Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * Update test_bridge_mode.py (#944) Co-authored-by: Gopi Raga <117985788+GopiRaga7@users.noreply.github.com> * Update ucentralgw-qa-deployment.yaml (#945) * Added sleep time in the rate limiting test case (#946) Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Fix roam OTA test issues with iwinfo output & Add Pass/Fail (#947) * improve re pattern to fetch ap data from iwconfig Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * fix config issue in wpa2 tests Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * fix key,value issues in config creation Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * fix empty radio & wifi-bands config issue Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * replace global config_data with local config in test Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * add ap logs per testcase to allure Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * fix missing underscore to get dut logs function Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * refine selected testbed logic as per testbed names in lab-info Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * marker and pass/fail addtions to roam ota tests Signed-off-by: anil-tegala <anil.tegala@candelatech.com> --------- Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * Add hfcl_ion4xi to the overview page (#948) Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Update ucentralgw-qa-deployment.yaml (#949) * Added udaya_a6-id2 to the sanity and performance overview page (#950) Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * WIFI-13871 CGW deploy testing (#951) Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> Co-authored-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * add roam ota twog & fiveg wpa2psk test (#952) * add roam ota twog and fiveg wpa2 psk test Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * set missing band in 2G config Signed-off-by: anil-tegala <anil.tegala@candelatech.com> --------- Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * Wifi 13874 (#953) * Added more logs to asb script Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Increased sleep time after factory reset for ASB tests Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> --------- Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * roam ota twog and fiveg wpa3psk test (#954) * add roam ota twog and fiveg wpa2 psk test Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * add roam ota twog and fiveg wpa3 psk test Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * set missing band in 2G config Signed-off-by: anil-tegala <anil.tegala@candelatech.com> --------- Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * add roam ota twog and fiveg wpa2-eap test (#955) Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * WIFI-13871: CGW deployment (#956) * WIFI-13871 CGW deploy testing Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * WIFI-13871 CGW deploy testing Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> --------- Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> Co-authored-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * Update cgw-dev-deployment.yaml * WIFI-13871 Correct branch for deploy repo Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * add roam ota twog and fiveg wpa3 enterprise test (#958) Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * WIFI-13871 Need sops installed as well Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * add roam ota 5g and 6g wpa2psk test (#959) * add roam ota fiveg and sixg wpa2psk test Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * change security type to wpa3 Signed-off-by: anil-tegala <anil.tegala@candelatech.com> --------- Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * Wifi 13853 (#960) * Removed >/dev/null 2>&1 for logs purpose Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added Verbosity for logs Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added retries=3 in the kubectl cp command Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added list of files in the pod /tmp/allure-results Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> --------- Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Wifi 13859 (#961) * Added hfcl_ion4xi in the sanity, performance, regression workflows and overview page Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Removed hfcl_ion4xi from overview page Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> --------- Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added wifi_capacity_ax_tests in the performance workflow Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Modified marker name for ax capacity Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added performance pass-fail criteria file Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added pass-fail values for edgecore_eap105,sercomm_ap72tip Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added pass-fail values for udaya_a6-id2 Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added pass-fail values for edgecore_eap111 Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * add roam ota fiveg and sixg wpa3 enterprise test (#963) Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * add roam ota twog and sixg sae test (#964) Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * add roam ota twog and sixg wpa3 enterprise test (#965) * add roam ota twog and sixg wpa3 enterprise test Signed-off-by: anil-tegala <anil.tegala@candelatech.com> --------- Signed-off-by: anil-tegala <anil.tegala@candelatech.com> * Handle locations inside deploy repo (#966) Co-authored-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> * Added edgecore_eap105,sercomm_ap72tip to the sanity and performance overview page (#967) Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Wifi 13921 (#969) * Modified as per new lab infra and Added udaya_a6-id2,edgecore_eap105,sercomm_ap72tip in the performance workflow Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Modified as per new lab infra and Added udaya_a6-id2,edgecore_eap105,sercomm_ap72tip in the sanity workflow Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Modified as per new lab infra and Added udaya_a6-id2,edgecore_eap105,sercomm_ap72tip in the regression workflow Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> --------- Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Replaced advanced-3b with advanced-1c (#971) Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> * Added wifi_capacity_ax_tests for udaya_a6-id2,edgecore_eap105,sercomm_ap72tip APs Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> --------- Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com> Signed-off-by: anil-tegala <anil.tegala@candelatech.com> Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com> Co-authored-by: Anil Kumar Tegala <anil.tegala@candelatech.com> Co-authored-by: Gopi Raga <117985788+GopiRaga7@users.noreply.github.com> Co-authored-by: GowthamPrajwal <86651786+GowthamPrajwal@users.noreply.github.com> Co-authored-by: mythri-candela <168416732+mythri-candela@users.noreply.github.com> Co-authored-by: Carsten Schafer <49571202+carsten989@users.noreply.github.com> Co-authored-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com>
2025-10-30 02:22:44 +00:00 · 2024-08-01 14:47:44 +05:30
parent ed8895d7cb
commit f4e7d51366
11 changed files with 844 additions and 98 deletions
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -30,7 +30,7 @@ on:
        description: "revision of firmware to flash on AP, <branch>-<commit>"
      marker_expressions:
        required: true
-        default: "client_scale_tests,dataplane_tests,peak_throughput_tests,dual_band_tests"
+        default: "client_scale_tests,dataplane_tests,wifi_capacity_ax_tests,peak_throughput_tests,dual_band_tests"
        description: "Marker expressions to select tests to execute"
      additional_args:
        default: ""
@@ -72,7 +72,7 @@ jobs:
          echo "ap_version=$(echo ${{ github.event.inputs.ap_version || 'next-latest' }})" >> $GITHUB_OUTPUT
          echo "existing_controller=$(echo ${{ github.event.inputs.existing_controller || 'qa01'}})" >> $GITHUB_OUTPUT

-          MARKER_EXPRESSIONS="${{ github.event.inputs.marker_expressions || 'client_scale_tests,dataplane_tests,peak_throughput_tests,dual_band_tests' }}"
+          MARKER_EXPRESSIONS="${{ github.event.inputs.marker_expressions || 'client_scale_tests,dataplane_tests,wifi_capacity_ax_tests,peak_throughput_tests,dual_band_tests' }}"
          MARKER_EXPRESSIONS=$(echo $MARKER_EXPRESSIONS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g')
          echo "additional_arguments=$(echo ${{ github.event.inputs.additional_arguments || ''}})" >> $GITHUB_OUTPUT
          cat >> $GITHUB_OUTPUT << EOF
@@ -204,6 +204,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-6a
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -381,6 +407,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-3a
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -558,6 +610,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-3b
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -735,6 +813,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-3
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -912,6 +1016,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-4
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -1089,6 +1219,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-1a
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -1266,6 +1422,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-1
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -1443,6 +1625,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-4a
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -1622,6 +1830,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-5
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -1799,6 +2033,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-5a
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -1977,6 +2237,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-6
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -2154,6 +2440,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-2
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -2331,6 +2643,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-2a
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -2508,6 +2846,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-6b
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -2685,6 +3049,32 @@ jobs:
        continue-on-error: true
        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-dtt

+      - name: run tests wifi_capacity_ax_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'wifi_capacity_ax_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wca
+          testbed: basic-6c
+          marker_expression: "performance and wifi_capacity_ax_tests"
+          configuration_file: "./lab_info.json"
+          testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
+          additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
+          allure_results_artifact_name: "allure-results-${{ steps.ap_model.outputs.model }}-wifi_capacity_ax_tests"
+          dns_records_to_resolve: "sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build gw-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build fms-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build"
+
+      # necessary because if conditionals in composite actions are currently not respected
+      - name: get tests logs
+        if: always()
+        continue-on-error: true
+        run: |
+          podname=$(kubectl get pods -n ${{ steps.namespace.outputs.name }}-wca --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wca $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wca
+
      - name: run tests peak_throughput_tests
        uses: ./.github/actions/run-tests
        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'peak_throughput_tests')"
@@ -2807,6 +3197,11 @@ jobs:
          name: allure-results-${{ matrix.model }}-dataplane_tests
          path: allure-results-dataplane_tests

+      - uses: actions/download-artifact@v3
+        with:
+          name: allure-results-${{ matrix.model }}-wifi_capacity_ax_tests
+          path: allure-results-wifi_capacity_ax_tests
+
      - uses: actions/download-artifact@v3
        with:
          name: allure-results-${{ matrix.model }}-peak_throughput_tests
@@ -2826,6 +3221,7 @@ jobs:
        run: |
          mkdir allure-results
          cp -r allure-results-dataplane_tests/* allure-results/
+          cp -r allure-results-wifi_capacity_ax_tests/* allure-results/
          cp -r allure-results-peak_throughput_tests/* allure-results/
          cp -r allure-results-client_scale_tests/* allure-results/
          cp -r allure-results-dual_band_tests/* allure-results/
--- a/tests/e2e/basic/performance_tests/AX_capacity/wpa2_personal/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/AX_capacity/wpa2_personal/test_bridge_mode.py
@@ -1,11 +1,11 @@
 """
    Performance Test: AX Capacity Test : BRIDGE Mode
-    pytest -m "wifi_capacity_ax and wpa2_personal and bridge"
+    pytest -m "wifi_capacity_ax_tests and wpa2_personal and bridge"
 """
 import pytest
 import allure

-pytestmark = [pytest.mark.performance, pytest.mark.bridge, pytest.mark.wifi_capacity_ax, pytest.mark.wpa2_personal]
+pytestmark = [pytest.mark.bridge, pytest.mark.wifi_capacity_ax_tests, pytest.mark.wpa2_personal]
 setup_params_general_5G = {
    "mode": "BRIDGE",
    "ssid_modes": {
@@ -39,6 +39,7 @@ setup_params_general_5G = {
 class TestWifiCapacityBRIDGEModeAX5G(object):
    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934")
    @pytest.mark.tcp_download
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Download wifi capacity")
    def test_client_wpa2_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -50,7 +51,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and fiveg and tcp_download
+        wifi_capacity_ax_tests and wpa2_personal and bridge and fiveg and tcp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -64,6 +65,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944")
    @pytest.mark.udp_download
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Download wifi capacity")
    def test_client_wpa2_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -75,7 +77,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and fiveg and udp_download
+        wifi_capacity_ax_tests and wpa2_personal and bridge and fiveg and udp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -100,7 +102,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and fiveg and tcp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and bridge and fiveg and tcp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -126,7 +128,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and fiveg and udp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and bridge and fiveg and udp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -141,6 +143,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942")
    @pytest.mark.tcp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Upload wifi capacity")
    def test_client_wpa2_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -152,7 +155,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and fiveg and tcp_upload
+        wifi_capacity_ax_tests and wpa2_personal and bridge and fiveg and tcp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -167,6 +170,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945")
    @pytest.mark.udp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Upload wifi capacity")
    def test_client_wpa2_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -178,7 +182,7 @@ class TestWifiCapacityBRIDGEModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and fiveg and udp_upload
+        wifi_capacity_ax_tests and wpa2_personal and bridge and fiveg and udp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -225,6 +229,7 @@ setup_params_general_2G = {
 class TestWifiCapacityBRIDGEModeAX2G(object):
    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13284", name="WIFI-13284")
    @pytest.mark.tcp_download
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Download wifi capacity")
    def test_client_wpa2_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -236,7 +241,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and twog and tcp_download
+        wifi_capacity_ax_tests and wpa2_personal and bridge and twog and tcp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -251,6 +256,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13287", name="WIFI-13287")
    @pytest.mark.udp_download
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Download wifi capacity")
    def test_client_wpa2_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -262,7 +268,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and twog and udp_download
+        wifi_capacity_ax_tests and wpa2_personal and bridge and twog and udp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -288,7 +294,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and twog and tcp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and bridge and twog and tcp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -315,7 +321,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and twog and udp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and bridge and twog and udp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -331,6 +337,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13285", name="WIFI-13285")
    @pytest.mark.tcp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Upload wifi capacity")
    def test_client_wpa2_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -342,7 +349,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and twog and tcp_upload
+        wifi_capacity_ax_tests and wpa2_personal and bridge and twog and tcp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -357,6 +364,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13288", name="WIFI-13288")
    @pytest.mark.udp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Upload wifi capacity")
    def test_client_wpa2_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration,
@@ -368,7 +376,7 @@ class TestWifiCapacityBRIDGEModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and bridge and twog and udp_upload
+        wifi_capacity_ax_tests and wpa2_personal and bridge and twog and udp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
--- a/tests/e2e/basic/performance_tests/AX_capacity/wpa2_personal/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/AX_capacity/wpa2_personal/test_nat_mode.py
@@ -1,11 +1,11 @@
 """
    Performance Test: AX Capacity Test : NAT Mode
-    pytest -m "wifi_capacity_ax and wpa2_personal and nat"
+    pytest -m "wifi_capacity_ax_tests and wpa2_personal and nat"
 """
 import pytest
 import allure

-pytestmark = [pytest.mark.performance, pytest.mark.nat, pytest.mark.wifi_capacity_ax, pytest.mark.wpa2_personal]
+pytestmark = [pytest.mark.nat, pytest.mark.wifi_capacity_ax_tests, pytest.mark.wpa2_personal]
 setup_params_general_5G = {
    "mode": "NAT",
    "ssid_modes": {
@@ -39,6 +39,7 @@ setup_params_general_5G = {
 class TestWifiCapacityNATModeAX5G(object):
    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6947", name="WIFI-6947")
    @pytest.mark.tcp_download
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Download wifi capacity")
    def test_client_wpa2_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -50,7 +51,7 @@ class TestWifiCapacityNATModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and fiveg and tcp_download
+        wifi_capacity_ax_tests and wpa2_personal and nat and fiveg and tcp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -65,6 +66,7 @@ class TestWifiCapacityNATModeAX5G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6950", name="WIFI-6950")
    @pytest.mark.udp_download
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Download wifi capacity")
    def test_client_wpa2_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -76,7 +78,7 @@ class TestWifiCapacityNATModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and fiveg and udp_download
+        wifi_capacity_ax_tests and wpa2_personal and nat and fiveg and udp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -102,7 +104,7 @@ class TestWifiCapacityNATModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and fiveg and tcp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and nat and fiveg and tcp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -128,7 +130,7 @@ class TestWifiCapacityNATModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and fiveg and udp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and nat and fiveg and udp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -143,6 +145,7 @@ class TestWifiCapacityNATModeAX5G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6948", name="WIFI-6948")
    @pytest.mark.tcp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Upload wifi capacity")
    def test_client_wpa2_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -154,7 +157,7 @@ class TestWifiCapacityNATModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and fiveg and tcp_upload
+        wifi_capacity_ax_tests and wpa2_personal and nat and fiveg and tcp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -169,6 +172,7 @@ class TestWifiCapacityNATModeAX5G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6951", name="WIFI-6951")
    @pytest.mark.udp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Upload wifi capacity")
    def test_client_wpa2_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -180,7 +184,7 @@ class TestWifiCapacityNATModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and fiveg and udp_upload
+        wifi_capacity_ax_tests and wpa2_personal and nat and fiveg and udp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -227,6 +231,7 @@ setup_params_general_2G = {
 class TestWifiCapacityNATModeAX2G(object):
    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13290", name="WIFI-13290")
    @pytest.mark.tcp_download
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Download wifi capacity")
    def test_client_wpa2_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -238,7 +243,7 @@ class TestWifiCapacityNATModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and twog and tcp_download
+        wifi_capacity_ax_tests and wpa2_personal and nat and twog and tcp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -253,6 +258,7 @@ class TestWifiCapacityNATModeAX2G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13293", name="WIFI-13293")
    @pytest.mark.udp_download
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Download wifi capacity")
    def test_client_wpa2_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -264,7 +270,7 @@ class TestWifiCapacityNATModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and twog and udp_download
+        wifi_capacity_ax_tests and wpa2_personal and nat and twog and udp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -290,7 +296,7 @@ class TestWifiCapacityNATModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and twog and tcp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and nat and twog and tcp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -316,7 +322,7 @@ class TestWifiCapacityNATModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and twog and udp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and nat and twog and udp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -331,6 +337,7 @@ class TestWifiCapacityNATModeAX2G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13291", name="WIFI-13291")
    @pytest.mark.tcp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client TCP Upload wifi capacity")
    def test_client_wpa2_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -342,7 +349,7 @@ class TestWifiCapacityNATModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and twog and tcp_upload
+        wifi_capacity_ax_tests and wpa2_personal and nat and twog and tcp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -357,6 +364,7 @@ class TestWifiCapacityNATModeAX2G(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-13294", name="WIFI-13294")
    @pytest.mark.udp_upload
+    @pytest.mark.performance
    @allure.title("Single AX client UDP Upload wifi capacity")
    def test_client_wpa2_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration,
@@ -368,7 +376,7 @@ class TestWifiCapacityNATModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and nat and twog and udp_upload
+        wifi_capacity_ax_tests and wpa2_personal and nat and twog and udp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
--- a/tests/e2e/basic/performance_tests/AX_capacity/wpa2_personal/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/AX_capacity/wpa2_personal/test_vlan_mode.py
@@ -1,11 +1,11 @@
 """
    Performance Test: AX Capacity Test : VLAN Mode
-    pytest -m "wifi_capacity_ax and wpa2_personal and vlan"
+    pytest -m "wifi_capacity_ax_tests and wpa2_personal and vlan"
 """
 import pytest
 import allure

-pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.wifi_capacity_ax, pytest.mark.wpa2_personal]
+pytestmark = [pytest.mark.vlan, pytest.mark.wifi_capacity_ax_tests, pytest.mark.wpa2_personal]
 setup_params_general_5G = {
    "mode": "VLAN",
    "ssid_modes": {
@@ -50,7 +50,7 @@ class TestWifiCapacityVLANModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and fiveg and tcp_download
+        wifi_capacity_ax_tests and wpa2_personal and vlan and fiveg and tcp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -77,7 +77,7 @@ class TestWifiCapacityVLANModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and fiveg and udp_download
+        wifi_capacity_ax_tests and wpa2_personal and vlan and fiveg and udp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -104,7 +104,7 @@ class TestWifiCapacityVLANModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and fiveg and tcp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and vlan and fiveg and tcp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -131,7 +131,7 @@ class TestWifiCapacityVLANModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and fiveg and udp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and vlan and fiveg and udp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -158,7 +158,7 @@ class TestWifiCapacityVLANModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and fiveg and tcp_upload
+        wifi_capacity_ax_tests and wpa2_personal and vlan and fiveg and tcp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -185,7 +185,7 @@ class TestWifiCapacityVLANModeAX5G(object):
        The 5Ghz station is configured for 80Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and fiveg and udp_upload
+        wifi_capacity_ax_tests and wpa2_personal and vlan and fiveg and udp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -244,7 +244,7 @@ class TestWifiCapacityVLANModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and twog and tcp_download
+        wifi_capacity_ax_tests and wpa2_personal and vlan and twog and tcp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -271,7 +271,7 @@ class TestWifiCapacityVLANModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and twog and udp_download
+        wifi_capacity_ax_tests and wpa2_personal and vlan and twog and udp_download

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -298,7 +298,7 @@ class TestWifiCapacityVLANModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and twog and tcp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and vlan and twog and tcp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -325,7 +325,7 @@ class TestWifiCapacityVLANModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and twog and udp_bidirectional
+        wifi_capacity_ax_tests and wpa2_personal and vlan and twog and udp_bidirectional

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -352,7 +352,7 @@ class TestWifiCapacityVLANModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and twog and tcp_upload
+        wifi_capacity_ax_tests and wpa2_personal and vlan and twog and tcp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
@@ -379,7 +379,7 @@ class TestWifiCapacityVLANModeAX2G(object):
        The 2.4Ghz station is configured for 20Mhz bandwidth and two spatial streams.

        Markers:
-        wifi_capacity_ax and wpa2_personal and vlan and twog and udp_upload
+        wifi_capacity_ax_tests and wpa2_personal and vlan and twog and udp_upload

        Note:
        Please refer to the PDF report for detailed observations and analysis of the test results.
--- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py
+++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py
@@ -1378,7 +1378,6 @@ class Test40Mhz2GChannel11PeakThroughput(object):
    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-10674", name="WIFI-10674")
    @pytest.mark.tcp_download
    @pytest.mark.ow_sanity_lf
-    @pytest.mark.performance
    @pytest.mark.channel_11
    @allure.title("Single client TCP Download wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
@@ -1399,7 +1398,6 @@ class Test40Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944")
    @pytest.mark.udp_download
-    @pytest.mark.performance
    @allure.title("Single client UDP Download wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, num_stations, setup_configuration):
@@ -1418,7 +1416,6 @@ class Test40Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943")
    @pytest.mark.tcp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client TCP Bidirectional wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                           get_test_device_logs, num_stations, setup_configuration):
@@ -1437,7 +1434,6 @@ class Test40Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946")
    @pytest.mark.udp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client UDP Bidirectional wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                           get_test_device_logs, num_stations, setup_configuration):
@@ -1456,7 +1452,6 @@ class Test40Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942")
    @pytest.mark.tcp_upload
-    @pytest.mark.performance
    @allure.title("Single client TCP Upload wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, num_stations, setup_configuration):
@@ -1475,7 +1470,6 @@ class Test40Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945")
    @pytest.mark.udp_upload
-    @pytest.mark.performance
    @allure.title("Single client UDP Upload wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                                get_test_device_logs, num_stations, setup_configuration):
--- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py
+++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py
@@ -47,7 +47,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):
    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934")
    @pytest.mark.tcp_download
    @pytest.mark.ow_sanity_lf
-    @pytest.mark.performance
    @allure.title("Single client TCP Download wifi capacity 80Mhz Bw")
    def test_client_wpa2_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration, check_connectivity):
@@ -66,7 +65,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944")
    @pytest.mark.udp_download
-    @pytest.mark.performance
    @allure.title("Single client UDP Download wifi capacity 80Mhz Bw")
    def test_client_wpa2_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -85,7 +83,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-10673", name="WIFI-10673")
    @pytest.mark.tcp_bidirectional
-    @pytest.mark.performance
    @pytest.mark.channel_36
    @allure.title("Single client TCP Bidirectional wifi capacity 80Mhz Bw")
    def test_client_wpa2_bridge_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
@@ -104,7 +101,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946")
    @pytest.mark.udp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client UDP Bidirectional wifi capacity 80Mhz Bw")
    def test_client_wpa2_bridge_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                  get_test_device_logs, num_stations, setup_configuration):
@@ -123,7 +119,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942")
    @pytest.mark.tcp_upload
-    @pytest.mark.performance
    @allure.title("Single client TCP Upload wifi capacity 80Mhz Bw")
    def test_client_wpa2_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -142,7 +137,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945")
    @pytest.mark.udp_upload
-    @pytest.mark.performance
    @allure.title("Single client UDP Upload wifi capacity 80Mhz Bw")
    def test_client_wpa2_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
--- a/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py
+++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/bridge_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py
@@ -41,13 +41,13 @@ setup_params_general = {
 )
@pytest.mark.wpa3_personal
@pytest.mark.twog
-@pytest.mark.performance
@pytest.mark.usefixtures("setup_configuration")
 class Test160Mhz6GChannelautoPeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12394", name="WIFI-12394")
    @pytest.mark.sixg
    @pytest.mark.tcp_download
+    @pytest.mark.performance
    @allure.title("Single client TCP Download wifi capacity 160Mhz Bw")
    def test_client_wpa3_bridge_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -58,15 +58,16 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "BRIDGE"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_bridge_tcp_download", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
+                                       download_rate="10Gbps", batch_size="1",
                                       upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12395", name="WIFI-12395")
    @pytest.mark.udp_download
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client UDP Download wifi capacity 160Mhz Bw")
    def test_client_wpa3_bridge_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -77,10 +78,10 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "BRIDGE"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_bridge_udp_dl", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
+                                       download_rate="10Gbps", batch_size="1",
                                       upload_rate="56Kbps", protocol="UDP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12397", name="WIFI-12397")
@@ -96,10 +97,10 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "BRIDGE"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_bridge_tcp_bidirectional", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000",
+                                       download_rate="10Gbps", batch_size="1",
+                                       upload_rate="10Gbps", protocol="TCP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12396", name="WIFI-12396")
@@ -115,15 +116,16 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "BRIDGE"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_bridge_udp_bidirectional", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000",
+                                       download_rate="10Gbps", batch_size="1",
+                                       upload_rate="10Gbps", protocol="UDP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12393", name="WIFI-12393")
    @pytest.mark.tcp_upload
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client TCP Upload wifi capacity 160Mhz Bw")
    def test_client_wpa3_bridge_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -135,14 +137,15 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        mode = "BRIDGE"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_bridge_tcp_ul", mode=mode,
                                       download_rate="56Kbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000",
+                                       upload_rate="10Gbps", protocol="TCP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12392", name="WIFI-12392")
    @pytest.mark.udp_upload
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client UDP Upload wifi capacity 160Mhz Bw")
    def test_client_wpa3_bridge_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -154,7 +157,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        mode = "BRIDGE"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_bridge_udp_ul", mode=mode,
                                       download_rate="56Kbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000",
+                                       upload_rate="10Gbps", protocol="UDP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True
--- a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py
+++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_40Mhz_2g.py
@@ -1366,7 +1366,6 @@ class Test20Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934")
    @pytest.mark.tcp_download
-    @pytest.mark.performance
    @allure.title("Single client TCP Download wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -1385,7 +1384,6 @@ class Test20Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944")
    @pytest.mark.udp_download
-    @pytest.mark.performance
    @allure.title("Single client UDP Download wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -1404,7 +1402,6 @@ class Test20Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943")
    @pytest.mark.tcp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client TCP Bidirectional wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_nat_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                  get_test_device_logs, num_stations, setup_configuration):
@@ -1423,7 +1420,6 @@ class Test20Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946")
    @pytest.mark.udp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client UDP Bidirectional wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_nat_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                  get_test_device_logs, num_stations, setup_configuration):
@@ -1442,7 +1438,6 @@ class Test20Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942")
    @pytest.mark.tcp_upload
-    @pytest.mark.performance
    @allure.title("Single client TCP Upload wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -1461,7 +1456,6 @@ class Test20Mhz2GChannel11PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945")
    @pytest.mark.udp_upload
-    @pytest.mark.performance
    @allure.title("Single client UDP Upload wifi capacity 40Mhz Bw")
    def test_client_wpa2_personal_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
--- a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py
+++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa2_personal_encryption/test_peak_throughput_wpa2_80Mhz_5g.py
@@ -46,7 +46,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6934", name="WIFI-6934")
    @pytest.mark.tcp_download
-    @pytest.mark.performance
    @allure.title("Single client TCP Download wifi capacity 80Mhz Bw")
    def test_client_wpa2_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -65,7 +64,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6944", name="WIFI-6944")
    @pytest.mark.udp_download
-    @pytest.mark.performance
    @allure.title("Single client UDP Download wifi capacity 80Mhz Bw")
    def test_client_wpa2_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -84,7 +82,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6943", name="WIFI-6943")
    @pytest.mark.tcp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client TCP Bidirectional wifi capacity 80Mhz Bw")
    def test_client_wpa2_nat_tcp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                  get_test_device_logs, num_stations, setup_configuration):
@@ -103,7 +100,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6946", name="WIFI-6946")
    @pytest.mark.udp_bidirectional
-    @pytest.mark.performance
    @allure.title("Single client UDP Bidirectional wifi capacity 80Mhz Bw")
    def test_client_wpa2_nat_udp_bidirectional(self, get_test_library, get_dut_logs_per_test_case,
                                                  get_test_device_logs, num_stations, setup_configuration):
@@ -122,7 +118,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6942", name="WIFI-6942")
    @pytest.mark.tcp_upload
-    @pytest.mark.performance
    @allure.title("Single client TCP Upload wifi capacity 80Mhz Bw")
    def test_client_wpa2_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
@@ -141,7 +136,6 @@ class Test80Mhz5GChannel36PeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-6945", name="WIFI-6945")
    @pytest.mark.udp_upload
-    @pytest.mark.performance
    @allure.title("Single client UDP Upload wifi capacity 80Mhz Bw")
    def test_client_wpa2_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                       get_test_device_logs, num_stations, setup_configuration):
--- a/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py
+++ b/tests/e2e/basic/performance_tests/peak_throughput_tests/nat_mode/wpa3_personal_encryption/test_peak_throughput_wpa3_160Mhz_6g.py
@@ -39,13 +39,13 @@ setup_params_general = {
 )
@pytest.mark.wpa3_personal
@pytest.mark.twog
-@pytest.mark.performance
@pytest.mark.usefixtures("setup_configuration")
 class Test160Mhz6GChannelautoPeakThroughput(object):

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12400", name="WIFI-12400")
    @pytest.mark.tcp_download
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client TCP Download wifi capacity 160Mhz Bw")
    def test_client_wpa3_nat_tcp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration):
@@ -56,15 +56,16 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "NAT-WAN"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_nat_tcp_download", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
+                                       download_rate="10Gbps", batch_size="1",
                                       upload_rate="56Kbps", protocol="TCP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12401", name="WIFI-12401")
    @pytest.mark.udp_download
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client UDP Download wifi capacity 160Mhz Bw")
    def test_client_wpa3_nat_udp_dl(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration):
@@ -75,10 +76,10 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "NAT-WAN"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_nat_udp_dl", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
+                                       download_rate="10Gbps", batch_size="1",
                                       upload_rate="56Kbps", protocol="UDP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12403", name="WIFI-12403")
@@ -94,10 +95,10 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "NAT-WAN"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_nat_tcp_bidirectional", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000",
+                                       download_rate="10Gbps", batch_size="1",
+                                       upload_rate="10Gbps", protocol="TCP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12402", name="WIFI-12402")
@@ -113,15 +114,16 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        ssid_name = profile_data["ssid_name"]
        mode = "NAT-WAN"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_nat_udp_bidirectional", mode=mode,
-                                       download_rate="1Gbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000",
+                                       download_rate="10Gbps", batch_size="1",
+                                       upload_rate="10Gbps", protocol="UDP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12399", name="WIFI-12399")
    @pytest.mark.tcp_upload
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client TCP Upload wifi capacity 160Mhz Bw")
    def test_client_wpa3_nat_tcp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration):
@@ -133,14 +135,15 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        mode = "NAT-WAN"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_nat_tcp_ul", mode=mode,
                                       download_rate="56Kbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000",
+                                       upload_rate="10Gbps", protocol="TCP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True

    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-12398", name="WIFI-12398")
    @pytest.mark.udp_upload
    @pytest.mark.sixg
+    @pytest.mark.performance
    @allure.title("Single client UDP Upload wifi capacity 160Mhz Bw")
    def test_client_wpa3_nat_udp_ul(self, get_test_library, get_dut_logs_per_test_case,
                                    get_test_device_logs, num_stations, setup_configuration):
@@ -152,7 +155,7 @@ class Test160Mhz6GChannelautoPeakThroughput(object):
        mode = "NAT-WAN"
        get_test_library.wifi_capacity(instance_name="test_client_wpa3_nat_udp_ul", mode=mode,
                                       download_rate="56Kbps", batch_size="1",
-                                       upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000",
+                                       upload_rate="10Gbps", protocol="UDP-IPv4", duration="60000",
                                       move_to_influx=False, dut_data=setup_configuration, ssid_name=ssid_name,
-                                       num_stations={"6G": 1})
+                                       num_stations={"6G": 1}, pass_fail_criteria=True)
        assert True
--- a/tests/e2e/basic/performance_tests/performance_pass_fail.json
+++ b/tests/e2e/basic/performance_tests/performance_pass_fail.json
@@ -0,0 +1,352 @@
+{
+  "AP Models": {
+    "edgecore_eap101":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "edgecore_eap102":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": 400,
+        "UDP": 440
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "edgecore_eap104":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      }
+    },
+    "edgecore_oap101-6e":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "6G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "6G 4x4 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "cig_wf188n":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "cig_wf196":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": 400,
+        "UDP": 440
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "6G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "6G 4x4 160MHz": {
+        "TCP": 3200,
+        "UDP": 3600
+      }
+    },
+    "cig_wf186w":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      }
+    },
+    "hfcl_ion4xe":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "yuncore_fap655":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "yuncore_ax820":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "edgecore_eap105":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "6G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "6G 4x4 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "sercomm_ap72tip":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "6G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "6G 4x4 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "udaya_a6-id2":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": null,
+        "UDP": null
+      }
+    },
+    "edgecore_eap111":{
+      "2G 2x2 20MHz": {
+        "TCP": 200,
+        "UDP": 220
+      },
+      "2G 4x4 20MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 80MHz": {
+        "TCP": 800,
+        "UDP": 900
+      },
+      "5G 3x3 80MHz": {
+        "TCP": 1200,
+        "UDP": 1350
+      },
+      "5G 4x4 80MHz": {
+        "TCP": null,
+        "UDP": null
+      },
+      "5G 2x2 160MHz": {
+        "TCP": 1600,
+        "UDP": 1800
+      },
+      "5G 3x3 160MHz": {
+        "TCP": 2400,
+        "UDP": 2700
+    }
+  }
+  }
+}