Added Dual band Tests to performance workflow (#788)

* Modified as per new infra and removed unwanted markers

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* modified dual_band_tests marker

Signed-off-by: anil-tegala <anil.tegala@candelatech.com>

* added dual_band_tests to performance workflow

Signed-off-by: anil-tegala <anil.tegala@candelatech.com>

---------

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
Signed-off-by: anil-tegala <anil.tegala@candelatech.com>
Co-authored-by: jitendracandela <jitendra.kushavah@candelatech.com>

.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"
+        default: "client_scale_tests,dataplane_tests,peak_throughput_tests,dual_band_tests"
         description: "Marker expressions to select tests to execute"
       existing_controller:
         required: false
@@ -67,7 +67,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' }}"
+          MARKER_EXPRESSIONS="${{ github.event.inputs.marker_expressions || 'client_scale_tests,dataplane_tests,peak_throughput_tests,dual_band_tests' }}"
           MARKER_EXPRESSIONS=$(echo $MARKER_EXPRESSIONS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g')
           cat >> $GITHUB_OUTPUT << EOF
           marker_expressions=${MARKER_EXPRESSIONS}
@@ -263,6 +263,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -451,6 +477,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -639,6 +691,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -827,6 +905,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -1015,6 +1119,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -1203,6 +1333,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -1391,6 +1547,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -1579,6 +1761,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -1767,6 +1975,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -1955,6 +2189,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -2143,6 +2403,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -2331,6 +2617,32 @@ jobs:
         continue-on-error: true
         run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
 
+      - name: run tests dual_band_tests
+        uses: ./.github/actions/run-tests
+        if: "!cancelled() && contains(fromJSON(needs.vars.outputs.marker_expressions), 'dual_band_tests')"
+        with:
+          namespace: ${{ steps.namespace.outputs.name }}-wct
+          testbed: basic
+          marker_expression: "performance and dual_band_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 }}-dual_band_tests"
+          dns_records_to_resolve: "sec-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build gw-${{ steps.reservation.outputs.namespace }}.cicd.lab.wlan.tip.build fms-${{ steps.reservation.outputs.namespace }}.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 }}-wct --no-headers -o custom-columns=":metadata.name" -l job-name=testing | sed "s/pod\///")
+          kubectl logs --timestamps -n ${{ steps.namespace.outputs.name }}-wct $podname || true
+
+      - name: delete namespace
+        if: always()
+        continue-on-error: true
+        run: kubectl delete ns --ignore-not-found=true --wait ${{ steps.namespace.outputs.name }}-wct
+
       - name: show gw logs
         if: failure()
         run: kubectl -n openwifi-${{ steps.reservation.outputs.namespace }} logs deployment/owgw
@@ -2388,12 +2700,18 @@ jobs:
           name: allure-results-${{ matrix.model }}-client_scale_tests
           path: allure-results-client_scale_tests
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: allure-results-${{ matrix.model }}-dual_band_tests
+          path: allure-results-dual_band_tests
+
       - name: merge results
         run: |
           mkdir allure-results
           cp -r allure-results-dataplane_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/
 
       - name: download history of previous run
         continue-on-error: true

tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : BRIDGE Mode
-       pytest -m "performance and dual_band_test and bridge"
+       pytest -m "performance and dual_band_tests and bridge"
 
 
 """
@@ -8,7 +8,7 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]
+pytestmark = [pytest.mark.dual_band_tests, pytest.mark.bridge, pytest.mark.performance_release]
 
 setup_params_general = {
     "mode": "BRIDGE",
@@ -21,7 +21,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -37,8 +37,9 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestOpenDualbandPerformanceBridge(object):
     """
-         pytest -m "performance and dual_band_test and bridge and open and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and bridge and open and twog  and fiveg"
     """
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3724", name="WIFI-3724")
     @pytest.mark.open
     @pytest.mark.twog
@@ -47,7 +48,7 @@ class TestOpenDualbandPerformanceBridge(object):
     def test_client_open_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                     Dual Band Test with open encryption
-                    pytest -m "dual_band_test and open"
+                    pytest -m "dual_band_tests and open"
         """
         profile_data = setup_params_general["ssid_modes"]["open"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -59,14 +60,13 @@ class TestOpenDualbandPerformanceBridge(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : NAT Mode
-       pytest -m "performance and dual_band_test and nat"
+       pytest -m "performance and dual_band_tests and nat"
 
 
 """
@@ -8,7 +8,7 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#,
+pytestmark = [pytest.mark.dual_band_tests, pytest.mark.nat, pytest.mark.performance_release]#,
 
 setup_params_general = {
     "mode": "NAT",
@@ -21,7 +21,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -37,8 +37,9 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestOpenDualbandPerformanceNat(object):
     """
-         pytest -m "performance and dual_band_test and nat and open and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and nat and open and twog  and fiveg"
     """
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3724", name="WIFI-3724")
     @pytest.mark.open
     @pytest.mark.twog
@@ -47,7 +48,7 @@ class TestOpenDualbandPerformanceNat(object):
     def test_client_open_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                     Dual Band Test with open encryption
-                    pytest -m "dual_band_test and open"
+                    pytest -m "dual_band_tests and open"
         """
         profile_data = setup_params_general["ssid_modes"]["open"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -59,14 +60,14 @@ class TestOpenDualbandPerformanceNat(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : VLAN Mode
-       pytest -m "performance and dual_band_test and vlan"
+       pytest -m "performance and dual_band_tests and vlan"
 
 
 """
@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]
+pytestmark = [pytest.mark.dual_band_tests, pytest.mark.vlan, pytest.mark.performance_release]
 
 setup_params_general = {
     "mode": "VLAN",
@@ -22,7 +22,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,8 +38,9 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestOpenDualbandPerformanceVLAN(object):
     """
-         pytest -m "performance and dual_band_test and vlan and open and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and vlan and open and twog  and fiveg"
     """
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3724", name="WIFI-3724")
     @pytest.mark.open
     @pytest.mark.twog
@@ -48,7 +49,7 @@ class TestOpenDualbandPerformanceVLAN(object):
     def test_client_open_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                     Dual Band Test with open encryption
-                    pytest -m "dual_band_test and open"
+                    pytest -m "dual_band_tests and open"
         """
         profile_data = setup_params_general["ssid_modes"]["open"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -60,14 +61,14 @@ class TestOpenDualbandPerformanceVLAN(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : BRIDGE Mode
-       pytest -m "performance and dual_band_test and bridge"
+       pytest -m "performance and dual_band_tests and bridge"
 
 
 """
@@ -8,7 +8,7 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge,
+pytestmark = [pytest.mark.dual_band_tests, pytest.mark.bridge,
               pytest.mark.single_station_dual_band_throughput]
 
 setup_params_general = {
@@ -22,7 +22,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,7 +38,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpa3DualbandPerformanceBridge(object):
     """
-         pytest -m "performance and dual_band_test and bridge and wpa3_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and bridge and wpa3_personal and twog  and fiveg"
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3728", name="WIFI-3728")
@@ -49,7 +49,7 @@ class TestWpa3DualbandPerformanceBridge(object):
     def test_client_wpa3_personal_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                             Dual Band Test with wpa3_personal encryption
-                            pytest -m "dual_band_test and wpa3_personal"
+                            pytest -m "dual_band_tests and wpa3_personal"
                 """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -61,14 +61,14 @@ class TestWpa3DualbandPerformanceBridge(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : NAT Mode
-       pytest -m "performance and dual_band_test and nat"
+       pytest -m "performance and dual_band_tests and nat"
 
 
 """
@@ -8,8 +8,7 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.nat, pytest.mark.dual_band_test]
+pytestmark = [pytest.mark.nat, pytest.mark.dual_band_tests]
-
 
 setup_params_general = {
     "mode": "NAT",
@@ -22,7 +21,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,7 +37,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpa3DualbandPerformanceNat(object):
     """
-         pytest -m "performance and dual_band_test and nat and wpa3_personal and twog  and fiveg."
+         pytest -m "performance and dual_band_tests and nat and wpa3_personal and twog  and fiveg."
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3728", name="WIFI-3728")
@@ -49,7 +48,7 @@ class TestWpa3DualbandPerformanceNat(object):
     def test_client_wpa3_personal_nat(self, get_test_library, setup_configuration, check_connectivity):
         """
                             Dual Band Test with wpa3_personal encryption
-                            pytest -m "dual_band_test and wpa3_personal"
+                            pytest -m "dual_band_tests and wpa3_personal"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -61,14 +60,14 @@ class TestWpa3DualbandPerformanceNat(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : VLAN Mode
-       pytest -m "performance and dual_band_test and vlan"
+       pytest -m "performance and dual_band_tests and vlan"
 
 
 """
@@ -8,21 +8,21 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]
+pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_tests]
-
 
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
         "wpa3_personal": [
-            {"ssid_name": "ssid_wpa3_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something", "vlan": 100}
+            {"ssid_name": "ssid_wpa3_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something",
+             "vlan": 100}
         ]},
     "rf": {},
     "radius": False
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,7 +38,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpa3DualbandPerformanceVlan(object):
     """
-         pytest -m "performance and dual_band_test and vlan and wpa3_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and vlan and wpa3_personal and twog  and fiveg"
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3728", name="WIFI-3728")
@@ -49,7 +49,7 @@ class TestWpa3DualbandPerformanceVlan(object):
     def test_client_wpa3_personal_vlan(self, get_test_library, setup_configuration, check_connectivity):
         """
                                     Dual Band Test with wpa3_personal encryption
-                                    pytest -m "dual_band_test and wpa3_personal"
+                                    pytest -m "dual_band_tests and wpa3_personal"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -61,14 +61,14 @@ class TestWpa3DualbandPerformanceVlan(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : BRIDGE Mode
-       pytest -m "performance and dual_band_test and bridge"
+       pytest -m "performance and dual_band_tests and bridge"
 
 
 """
@@ -8,7 +8,7 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge,
+pytestmark = [pytest.mark.performance, pytest.mark.dual_band_tests, pytest.mark.bridge,
               pytest.mark.single_station_dual_band_throughput]
 
 setup_params_general = {
@@ -22,7 +22,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,8 +38,9 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpa2DualbandPerformanceBridge(object):
     """
-         pytest -m "performance and dual_band_test and bridge and wpa2_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and bridge and wpa2_personal and twog  and fiveg"
     """
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3918", name="WIFI-3918")
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
@@ -48,7 +49,7 @@ class TestWpa2DualbandPerformanceBridge(object):
     def test_client_wpa2_personal_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                 Dual Band Test with wpa2_personal encryption
-                pytest -m "dual_band_test and wpa2_personal"
+                pytest -m "dual_band_tests and wpa2_personal"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -60,14 +61,14 @@ class TestWpa2DualbandPerformanceBridge(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : NAT Mode
-       pytest -m "performance and dual_band_test and nat"
+       pytest -m "performance and dual_band_tests and nat"
 
 
 """
@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat,
+pytestmark = [pytest.mark.performance, pytest.mark.dual_band_tests, pytest.mark.nat,
               pytest.mark.single_station_dual_band_throughput]
 setup_params_general = {
     "mode": "NAT",
@@ -22,7 +22,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,8 +38,9 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpa2DualbandPerformanceNat(object):
     """
-         pytest -m "performance and dual_band_test and nat and wpa2_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and nat and wpa2_personal and twog  and fiveg"
     """
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3918", name="WIFI-3918")
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
@@ -48,7 +49,7 @@ class TestWpa2DualbandPerformanceNat(object):
     def test_client_wpa2_personal_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                                     Dual Band Test with wpa2_personal encryption
-                                    pytest -m "dual_band_test and wpa2_personal"
+                                    pytest -m "dual_band_tests and wpa2_personal"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -60,14 +61,14 @@ class TestWpa2DualbandPerformanceNat(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : VLAN Mode
-       pytest -m "performance and dual_band_test and vlan"
+       pytest -m "performance and dual_band_tests and vlan"
 
 
 """
@@ -11,19 +11,18 @@ import pytest
 
 pytestmark = [pytest.mark.performance, pytest.mark.vlan]
 
-
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
         "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something", "vlan": 100}
+            {"ssid_name": "ssid_wpa2_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something",
+             "vlan": 100}
         ]},
     "rf": {},
     "radius": False
 }
 
 
-@pytest.mark.dual_band_test
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -39,8 +38,9 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpa2DualbandPerformanceVLAN(object):
     """
-         pytest -m "performance and dual_band_test and VLAN and wpa2_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and VLAN and wpa2_personal and twog  and fiveg"
     """
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3918", name="WIFI-3918")
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
@@ -49,7 +49,7 @@ class TestWpa2DualbandPerformanceVLAN(object):
     def test_client_wpa2_personal_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                                     Dual Band Test with wpa2_personal encryption
-                                    pytest -m "dual_band_test and wpa2_personal"
+                                    pytest -m "dual_band_tests and wpa2_personal"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -61,14 +61,14 @@ class TestWpa2DualbandPerformanceVLAN(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : BRIDGE Mode
-       pytest -m "performance and dual_band_test and bridge"
+       pytest -m "performance and dual_band_tests and bridge"
 
 
 """
@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge,
+pytestmark = [pytest.mark.dual_band_tests, pytest.mark.bridge,
               pytest.mark.single_station_dual_band_throughput]
 
 setup_params_general = {
@@ -23,7 +23,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -40,7 +40,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpaDualbandPerformanceBridge(object):
     """
-         pytest -m "performance and dual_band_test and bridge and wpa_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and bridge and wpa_personal and twog  and fiveg"
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3726", name="WIFI-3726")
@@ -51,7 +51,7 @@ class TestWpaDualbandPerformanceBridge(object):
     def test_client_wpa_personal_bridge(self, get_test_library, setup_configuration, check_connectivity):
         """
                             Dual Band Test with wpa encryption
-                            pytest -m "dual_band_test and wpa"
+                            pytest -m "dual_band_tests and wpa"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -63,14 +63,14 @@ class TestWpaDualbandPerformanceBridge(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : NAT Mode
-       pytest -m "performance and dual_band_test and nat"
+       pytest -m "performance and dual_band_tests and nat"
 
 
 """
@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat,
+pytestmark = [pytest.mark.dual_band_tests, pytest.mark.nat,
               pytest.mark.single_station_dual_band_throughput]
 setup_params_general = {
     "mode": "NAT",
@@ -22,7 +22,7 @@ setup_params_general = {
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,7 +38,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpaDualbandPerformanceNat(object):
     """
-         pytest -m "performance and dual_band_test and nat and wpa_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and nat and wpa_personal and twog  and fiveg"
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3726", name="WIFI-3726")
@@ -49,7 +49,7 @@ class TestWpaDualbandPerformanceNat(object):
     def test_client_wpa_personal_nat(self, get_test_library, setup_configuration, check_connectivity):
         """
                             Dual Band Test with wpa encryption
-                            pytest -m "dual_band_test and wpa"
+                            pytest -m "dual_band_tests and wpa"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -61,14 +61,14 @@ class TestWpaDualbandPerformanceNat(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py

@@ -1,6 +1,6 @@
 """
        Dual Band Performance Test : VLAN Mode
-       pytest -m "performance and dual_band_test and vlan"
+       pytest -m "performance and dual_band_tests and vlan"
 
 
 """
@@ -9,20 +9,21 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]
+pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_tests]
 
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
         "wpa": [
-            {"ssid_name": "ssid_wpa_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something", "vlan": 100}
+            {"ssid_name": "ssid_wpa_personal_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something",
+             "vlan": 100}
         ]},
     "rf": {},
     "radius": False
 }
 
 
-@pytest.mark.dual_band_test
+@pytest.mark.dual_band_tests
 @pytest.mark.wifi5
 @pytest.mark.wifi6
 @pytest.mark.parametrize(
@@ -38,7 +39,7 @@ setup_params_general = {
 @pytest.mark.usefixtures("setup_configuration")
 class TestWpaDualbandPerformanceVLAN(object):
     """
-         pytest -m "performance and dual_band_test and vlan and wpa_personal and twog  and fiveg"
+         pytest -m "performance and dual_band_tests and vlan and wpa_personal and twog  and fiveg"
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3726", name="WIFI-3726")
@@ -49,7 +50,7 @@ class TestWpaDualbandPerformanceVLAN(object):
     def test_client_wpa_personal_vlan(self, get_test_library, setup_configuration, check_connectivity):
         """
                             Dual Band Test with wpa encryption
-                            pytest -m "dual_band_test and wpa"
+                            pytest -m "dual_band_tests and wpa"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa"]
         ssid_2G, ssid_5G = profile_data[0]["ssid_name"], profile_data[0]["ssid_name"]
@@ -61,14 +62,14 @@ class TestWpaDualbandPerformanceVLAN(object):
         for i in setup_configuration[dut_name]['ssid_data']:
             get_test_library.dut_idx_mapping[str(i)] = list(setup_configuration[dut_name]['ssid_data'][i].values())
             if get_test_library.dut_idx_mapping[str(i)][3] == "5G":
-                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_5g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
             if get_test_library.dut_idx_mapping[str(i)][3] == "2G":
-                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + get_test_library.dut_idx_mapping[str(i)][4]
+                dut_2g = dut_name + ' ' + get_test_library.dut_idx_mapping[str(i)][0] + ' ' + \
+                         get_test_library.dut_idx_mapping[str(i)][4]
 
-        result, description = get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
+        get_test_library.dual_band_performance_test(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, vlan_id=vlan,
                                                     dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags,
                                                     move_to_influx=False, dut_data=setup_configuration)
-        if result:
+
         assert True
-        else:
-            assert False, description