diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index c6f5814df..239b8ac0a 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -74,9 +74,20 @@ jobs: needs: [ build ] steps: + - name: install aws CLI tool + run: | + curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" + unzip awscliv2.zip + sudo ./aws/install + - name: get EKS access credentials run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} + - name: install kubectl + run: | + curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" + sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl + - name: install Allure CLI tool run: | wget https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/${{ env.ALLURE_CLI_VERSION }}/allure-commandline-${{ env.ALLURE_CLI_VERSION }}.tgz @@ -101,7 +112,7 @@ jobs: EOF kubectl create secret generic configuration --from-file=configuration=./configuration.py - - name: run perf tests + - name: run tests run: | cat </dev/null 2>&1 exit $(kubectl get pod $podname --output="jsonpath={.status.containerStatuses[].state.terminated.exitCode}") - - name: print logs - if: always() - run: | - podname=$(kubectl get pods --no-headers -o custom-columns=":metadata.name" -l job-name="${{ steps.job.outputs.name }}" | sed "s/pod\///") - kubectl logs $podname - - name: upload Allure results as artifact if: always() uses: actions/upload-artifact@v2 diff --git a/.github/workflows/quali.yml b/.github/workflows/quali.yml index f9985e3d9..a1887dbba 100644 --- a/.github/workflows/quali.yml +++ b/.github/workflows/quali.yml @@ -19,30 +19,31 @@ env: on: workflow_dispatch: inputs: - ucentral_revision: + openwifi_revision: required: true default: 'main' - description: 'revision of the uCentral Helm chart' - ucentral_gw_revision: + description: 'revision of the Open Wifi Helm chart' + openwifi_gw_revision: required: true default: 'master' - description: 'revision of the uCentral gateway service' - ucentral_sec_revision: + description: 'revision of the Open Wifi gateway service' + openwifi_sec_revision: required: true default: 'main' - description: 'revision of the uCentral security service' - ucentral_fms_revision: + description: 'revision of the Open Wifi security service' + openwifi_fms_revision: required: true default: 'main' - description: 'revision of the uCentral fms service' - ucentral_ui_revision: + description: 'revision of the Open Wifi fms service' + openwifi_ui_revision: required: true default: 'main' - description: 'revision of the uCentral UI' - ap_model: + description: 'revision of the Open Wifi UI' + ap_models: required: true - default: 'ec420' - description: 'the AP model to test' + #default: 'EC420,EAP101,ECW5211,ECW5410' + default: 'EC420,ECW5211' + description: 'the AP models to test' ap_version: required: true default: 'latest' @@ -52,51 +53,40 @@ jobs: vars: runs-on: ubuntu-latest outputs: - ucentral_revision: ${{ steps.vars.outputs.ucentral}} - ucentral_gw_revision: ${{ steps.vars.outputs.gw}} - ucentral_sec_revision: ${{ steps.vars.outputs.sec}} - ucentral_fms_revision: ${{ steps.vars.outputs.fms}} - ucentral_ui_revision: ${{ steps.vars.outputs.ui}} - ap_model: ${{ steps.vars.outputs.ap_model}} + openwifi_revision: ${{ steps.vars.outputs.openwifi}} + openwifi_gw_revision: ${{ steps.vars.outputs.gw}} + openwifi_sec_revision: ${{ steps.vars.outputs.sec}} + openwifi_fms_revision: ${{ steps.vars.outputs.fms}} + openwifi_ui_revision: ${{ steps.vars.outputs.ui}} + ap_models: ${{ steps.vars.outputs.ap_models}} ap_version: ${{ steps.vars.outputs.ap_version}} steps: - name: set variables id: vars run: | - echo ::set-output name=ucentral::$(echo "${{ github.event.inputs.ucentral_revision || 'main' }}") - echo ::set-output name=gw::$(echo "${{ github.event.inputs.ucentral_gw_revision || 'master' }}") - echo ::set-output name=sec::$(echo "${{ github.event.inputs.ucentral_sec_revision || 'main' }}") - echo ::set-output name=fms::$(echo "${{ github.event.inputs.ucentral_fms_revision || 'main' }}") - echo ::set-output name=ui::$(echo "${{ github.event.inputs.ucentral_ui_revision || 'main' }}") - echo ::set-output name=ap_model::$(echo "${{ github.event.inputs.ap_model || 'ec420' }}") + echo ::set-output name=openwifi::$(echo "${{ github.event.inputs.openwifi_revision || 'main' }}") + echo ::set-output name=gw::$(echo "${{ github.event.inputs.openwifi_gw_revision || 'master' }}") + echo ::set-output name=sec::$(echo "${{ github.event.inputs.openwifi_sec_revision || 'main' }}") + echo ::set-output name=fms::$(echo "${{ github.event.inputs.openwifi_fms_revision || 'main' }}") + echo ::set-output name=ui::$(echo "${{ github.event.inputs.openwifi_ui_revision || 'main' }}") + echo ::set-output name=ap_models::$(echo "${{ github.event.inputs.ap_models || 'EC420,EAP101,ECW5211,ECW5410' }}") echo ::set-output name=ap_version::$(echo "${{ github.event.inputs.ap_version || 'latest' }}") - start-reservation: - needs: vars + generate-matrix: + name: generate AP model matrix runs-on: ubuntu-latest + needs: vars outputs: - reservation_id: ${{ steps.start.outputs.res_id }} - env: - CLOUDSHELL_URL: quali-cloudshell.lab.wlan.tip.build - CLOUDSHELL_USER: admin - CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }} + matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.8' - - - name: install dependencies - run: pip install -r .quali/requirements.txt - - - name: start reservation - id: start - run: echo ::set-output name=res_id::$(python .quali/start_reservation.py --ucentral-version "${{ needs.vars.outputs.ucentral_revision }}" --ucentral-gw-version "${{ needs.vars.outputs.ucentral_gw_revision }}" --ucentral-sec-version "${{ needs.vars.outputs.ucentral_sec_revision }}" --ucentral-fms-version "${{ needs.vars.outputs.ucentral_fms_revision }}" --ucentral-ui-version "${{ needs.vars.outputs.ucentral_ui_revision }}") - - - name: wait for DNS to propagate - run: sleep 300 + - name: generate-matrix + id: set-matrix + run: | + AP_MODELS="${{ needs.vars.outputs.ap_models }}" + AP_MODELS=$(echo $AP_MODELS | sed "s/,/\",\"/g" | sed 's/^/[\"/g' | sed 's/$/\"]/g') + AP_MODELS=$(echo "$AP_MODELS" | jq -c 'map({"ap_model":.})') + echo "::set-output name=matrix::{\"include\":${AP_MODELS}}" build: runs-on: ubuntu-latest @@ -127,15 +117,18 @@ jobs: run: docker push ${{ env.DOCKER_SERVER }}/cloud-sdk-nightly:${{ github.run_id }} test: - needs: ['start-reservation', 'build'] + needs: ['generate-matrix', 'build', 'vars'] runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: ${{ fromJson( needs.generate-matrix.outputs.matrix ) }} env: CLOUDSHELL_URL: quali-cloudshell.lab.wlan.tip.build CLOUDSHELL_USER: admin CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }} + steps: - uses: actions/checkout@v2 - - name: Set up Python uses: actions/setup-python@v2 with: @@ -144,6 +137,13 @@ jobs: - name: install dependencies run: pip install -r .quali/requirements.txt + - name: start reservation + id: start + run: echo ::set-output name=res_id::$(python .quali/start_reservation.py --openwifi-version "${{ needs.vars.outputs.openwifi_revision }}" --openwifi-gw-version "${{ needs.vars.outputs.openwifi_gw_revision }}" --openwifi-sec-version "${{ needs.vars.outputs.openwifi_sec_revision }}" --openwifi-fms-version "${{ needs.vars.outputs.openwifi_fms_revision }}" --openwifi-ui-version "${{ needs.vars.outputs.openwifi_ui_revision }}" --ap-model "${{ matrix.ap_model }}") + + - name: wait for DNS to propagate + run: sleep 300 + - name: get EKS access credentials run: aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }} @@ -159,7 +159,7 @@ jobs: - name: prepare namespace id: namespace run: | - NAMESPACE="testing-${{ github.run_id }}-basic" + NAMESPACE="testing-${{ github.run_id }}-$(echo ${{ matrix.ap_model }} | tr '[:upper:]' '[:lower:]')" kubectl create ns $NAMESPACE kubectl config set-context --current --namespace=$NAMESPACE echo "::set-output name=name::${NAMESPACE}" @@ -170,7 +170,7 @@ jobs: Customer = "" server = "" CONFIGURATION = { - "basic": $(python .quali/get_configuration.py ${{ needs.start-reservation.outputs.reservation_id }}) + "basic": $(python .quali/get_configuration.py ${{ steps.start.outputs.res_id }}) } RADIUS_SERVER_DATA = { @@ -476,7 +476,8 @@ jobs: - -c - | cd tests - pytest -m "uc_sanity" -s -vvv --testbed="basic" --alluredir=/tmp/allure-results -o firmware="${{ needs.vars.outputs.ap_version }}" + #pytest -m "uc_sanity" -s -vvv --testbed="basic" --alluredir=/tmp/allure-results -o firmware="${{ needs.vars.outputs.ap_version }}" + pytest -m "sdk_restapi" -s -vvv --testbed="basic" --alluredir=/tmp/allure-results -o firmware="${{ needs.vars.outputs.ap_version }}" ret=\$? # sleep some time to be able to download the Allure results sleep 60 @@ -513,11 +514,7 @@ jobs: echo "waiting for pod to exit" kubectl logs -f $podname >/dev/null 2>&1 exit $(kubectl get pod $podname --output="jsonpath={.status.containerStatuses[].state.terminated.exitCode}") - #- name: print logs - # if: always() - # run: | - # podname=$(kubectl get pods --no-headers -o custom-columns=":metadata.name" -l job-name="${{ steps.job.outputs.name }}" | sed "s/pod\///") - # kubectl logs $podname + - name: upload Allure results as artifact if: always() uses: actions/upload-artifact@v2 @@ -530,26 +527,9 @@ jobs: run: | kubectl delete ns "${{ steps.namespace.outputs.name }}" --wait=true - stop-reservation: - needs: ['start-reservation', test] - if: always() - runs-on: ubuntu-latest - env: - CLOUDSHELL_URL: quali-cloudshell.lab.wlan.tip.build - CLOUDSHELL_USER: admin - CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }} - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.8' - - - name: install dependencies - run: pip install -r .quali/requirements.txt - - name: stop reservation - run: python .quali/stop_reservation.py ${{ needs.start-reservation.outputs.reservation_id }} + if: always() + run: python .quali/stop_reservation.py ${{ steps.start.outputs.res_id }} cleanup: needs: [ test ] diff --git a/.github/workflows/uc_sanity.yml b/.github/workflows/uc_sanity.yml index 523d23263..af20305ec 100644 --- a/.github/workflows/uc_sanity.yml +++ b/.github/workflows/uc_sanity.yml @@ -107,11 +107,11 @@ jobs: run: | export NAMESPACE=${{ github.run_id }} export DEPLOY_METHOD=git - export CHART_VERSION=main - export OWGW_VERSION=master - export OWGWUI_VERSION=main - export OWSEC_VERSION=main - export OWFMS_VERSION=main + export CHART_VERSION=v2.2.0-RC1 + export OWGW_VERSION=v2.2.0-RC1 + export OWGWUI_VERSION=v2.2.0-RC1 + export OWSEC_VERSION=v2.2.0-RC1 + export OWFMS_VERSION=v2.2.0-RC1 export VALUES_FILE_LOCATION=values.ucentral-qa.yaml export RTTY_TOKEN=${{ secrets.RTTY_TOKEN }} export OWGW_AUTH_USERNAME=${{ secrets.UCENTRALGW_AUTH_USERNAME }} @@ -271,7 +271,7 @@ jobs: - -c - | cd tests - pytest -m "${{ github.event.inputs.marker_expression || 'uc_sanity' }}" -s -vvv --testbed="${{ matrix.testbed }}" --alluredir=/tmp/allure-results -o firmware=latest + pytest -m "${{ github.event.inputs.marker_expression || 'uc_sanity' }}" -s -vvv --testbed="${{ matrix.testbed }}" --alluredir=/tmp/allure-results ret=\$? # sleep some time to be able to download the Allure results sleep 60 @@ -476,7 +476,7 @@ jobs: run: | for id in $(echo -e 'from configuration import CONFIGURATION\nfor ap in CONFIGURATION["${{ matrix.testbed }}"]["access_point"]: print(ap["serial"])' | python3) do - ./wlan-pki-cert-scripts/digicert-change-ap-redirector.sh $id gw-ucentral-qa01.cicd.lab.wlan.tip.build + ./wlan-pki-cert-scripts/digicert-change-ap-redirector.sh $id gw-qa01.cicd.lab.wlan.tip.build done - name: factory reset APs diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index bccf0b0b0..e58d3284e 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -29,11 +29,11 @@ env: { "namespace": "dev01", "deploy_method": "git", - "chart_version": "v2.1.0-RC3", - "owgw_version": "v2.1.0-RC3", - "owsec_version": "v2.1.0-RC1", - "owfms_version": "v2.1.0-RC1", - "owgwui_version": "v2.1.0-RC1" + "chart_version": "v2.2.0-RC1", + "owgw_version": "v2.2.0-RC1", + "owsec_version": "v2.2.0-RC1", + "owfms_version": "v2.2.0-RC1", + "owgwui_version": "v2.2.0-RC1" } ]' diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 37b4e7d45..28dcf0f86 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -29,11 +29,11 @@ env: { "namespace": "qa01", "deploy_method": "git", - "chart_version": "main", - "owgw_version: "master", - "owsec_version": "main", - "owfms_version": "main", - "owgwui_version": "main" + "chart_version": "v2.2.0-RC1", + "owgw_version": "v2.2.0-RC1", + "owsec_version": "v2.2.0-RC1", + "owfms_version": "v2.2.0-RC1", + "owgwui_version": "v2.2.0-RC1" } ]' diff --git a/.quali/get_configuration.py b/.quali/get_configuration.py index 89e370721..c45dbfd00 100644 --- a/.quali/get_configuration.py +++ b/.quali/get_configuration.py @@ -23,13 +23,13 @@ def main(): if service.ServiceName != 'Helm Service V2': continue - config['controller']['url'] = f'https://sec-ucentral-{res_id.split("-")[0]}.cicd.lab.wlan.tip.build:16001' + config['controller']['url'] = f'https://sec-{res_id.split("-")[0]}.cicd.lab.wlan.tip.build:16001' config['controller']['username'] = next(attr.Value for attr in service.Attributes if attr.Name == f'{service.ServiceName}.User') #config['controller']['password'] = next(attr.Value for attr in service.Attributes if attr.Name == f'{service.ServiceName}.Password') config['controller']['password'] = 'openwifi' for resource in resources_in_reservation: - if resource.ResourceModelName == 'Ap': + if resource.ResourceModelName == 'ApV2': details = session.GetResourceDetails(resource.Name) ap_config = {} diff --git a/.quali/start_reservation.py b/.quali/start_reservation.py index 85dba126f..90a87e680 100644 --- a/.quali/start_reservation.py +++ b/.quali/start_reservation.py @@ -11,11 +11,11 @@ run_id = os.environ.get('GITHUB_RUN_NUMBER', 1) def main(): parser = argparse.ArgumentParser() - parser.add_argument('--ucentral-version', default='main') - parser.add_argument('--ucentral-gw-version', default='master') - parser.add_argument('--ucentral-sec-version', default='main') - parser.add_argument('--ucentral-fms-version', default='main') - parser.add_argument('--ucentral-ui-version', default='main') + parser.add_argument('--openwifi-version', default='main') + parser.add_argument('--openwifi-gw-version', default='master') + parser.add_argument('--openwifi-sec-version', default='main') + parser.add_argument('--openwifi-fms-version', default='main') + parser.add_argument('--openwifi-ui-version', default='main') parser.add_argument('--ap-model', default='EC420') parser.add_argument('--wifi-type', default='Wifi5') args = parser.parse_args() @@ -28,11 +28,11 @@ def main(): durationInMinutes=360, topologyFullPath='Basic Lab', globalInputs=[ - UpdateTopologyGlobalInputsRequest('Chart Version', args.ucentral_version), - UpdateTopologyGlobalInputsRequest('ucentralgw Version', args.ucentral_gw_version), - UpdateTopologyGlobalInputsRequest('ucentralsec Version', args.ucentral_sec_version), - UpdateTopologyGlobalInputsRequest('ucentralfms Version', args.ucentral_fms_version), - UpdateTopologyGlobalInputsRequest('ucentralgwui Version', args.ucentral_ui_version), + UpdateTopologyGlobalInputsRequest('Chart Version', args.openwifi_version), + UpdateTopologyGlobalInputsRequest('owgw Version', args.openwifi_gw_version), + UpdateTopologyGlobalInputsRequest('owsec Version', args.openwifi_sec_version), + UpdateTopologyGlobalInputsRequest('owfms Version', args.openwifi_fms_version), + UpdateTopologyGlobalInputsRequest('owgwui Version', args.openwifi_ui_version), UpdateTopologyGlobalInputsRequest('AP Model', args.ap_model), UpdateTopologyGlobalInputsRequest('Wifi type', args.wifi_type), ] diff --git a/libs/controller/controller_2x/controller.py b/libs/controller/controller_2x/controller.py index 2b0a41723..0d61beb05 100644 --- a/libs/controller/controller_2x/controller.py +++ b/libs/controller/controller_2x/controller.py @@ -411,7 +411,7 @@ class UProfileUtility: "band": "2G", "country": "US", # "channel-mode": "HE", - "channel-width": 20, + "channel-width": 40, # "channel": 11 }) self.base_profile_config["radios"].append({ diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index d335bcc1a..3620d94dc 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -301,6 +301,8 @@ class RunTest: # self.client_connect.sta_prefix = self.twog_prefix if band == "fiveg": self.client_connect.radio = self.fiveg_radios[0] + if band == "ax": + self.client_connect.radio = self.ax_radios[0] self.client_connect.build() self.client_connect.wait_for_ip(station_name) print(self.client_connect.wait_for_ip(station_name)) diff --git a/tests/configuration.py b/tests/configuration.py index f702d7f75..747e45d17 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -116,7 +116,7 @@ CONFIGURATION = { }, # checked deployed "basic-03": { "controller": { - 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller + 'url': 'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller 'username': "tip@ucentral.com", 'password': 'openwifi', }, diff --git a/tests/controller_tests/ucentral_gateway/test_gatewayservice.py b/tests/controller_tests/ucentral_gateway/test_gatewayservice.py index 1391bd424..756ae4281 100644 --- a/tests/controller_tests/ucentral_gateway/test_gatewayservice.py +++ b/tests/controller_tests/ucentral_gateway/test_gatewayservice.py @@ -13,6 +13,103 @@ import allure class TestUcentralGatewayService(object): """ """ + configuration = { + "uuid": 1, + "radios": [ + { + "band": "5G", + "country": "CA", + "channel-mode": "HE", + "channel-width": 80 + } + ], + + "interfaces": [ + { + "name": "WAN", + "role": "upstream", + "services": [ "lldp" ], + "ethernet": [ + { + "select-ports": [ + "WAN*" + ] + } + ], + "ipv4": { + "addressing": "dynamic" + }, + "ssids": [ + { + "name": "OpenWifi", + "wifi-bands": [ + "5G" + ], + "bss-mode": "ap", + "encryption": { + "proto": "psk2", + "key": "OpenWifi", + "ieee80211w": "optional" + } + } + ] + }, + { + "name": "LAN", + "role": "downstream", + "services": [ "ssh", "lldp" ], + "ethernet": [ + { + "select-ports": [ + "LAN*" + ] + } + ], + "ipv4": { + "addressing": "static", + "subnet": "192.168.1.1/24", + "dhcp": { + "lease-first": 10, + "lease-count": 100, + "lease-time": "6h" + } + }, + "ssids": [ + { + "name": "OpenWifi", + "wifi-bands": [ + "5G" + ], + "bss-mode": "ap", + "encryption": { + "proto": "psk2", + "key": "OpenWifi", + "ieee80211w": "optional" + } + } + ] + + } + ], + "metrics": { + "statistics": { + "interval": 120, + "types": [ "ssids", "lldp", "clients" ] + }, + "health": { + "interval": 120 + } + }, + "services": { + "lldp": { + "describe": "2.x", + "location": "universe" + }, + "ssh": { + "port": 22 + } + } + } @pytest.mark.sdk_restapi def test_gwservice_listdevices(self, setup_controller): @@ -34,17 +131,18 @@ class TestUcentralGatewayService(object): Test the create device endpoint WIFI-3453 """ - configuration = {'uuid': '1'} - payload = {'serialNumber': 'DEADBEEF0011', + + payload = {'serialNumber': 'deadbeef0011', 'UUID': '123456', - 'configuration': configuration, + 'configuration': self.configuration, 'deviceType': 'AP', 'location': '', 'macAddress': 'DE:AD:BE:EF:00:11', 'manufacturer': 'Testing', 'owner': ''} print(json.dumps(payload)) - resp = setup_controller.request("gw", "device/DEADBEEF0011", "POST", None, json.dumps(payload)) + resp = setup_controller.request("gw", "device/deadbeef0011", "POST", None, json.dumps(payload)) + allure.attach(name="response: ", body=str(resp.json())) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw create devices", body=body) if resp.status_code != 200: @@ -52,34 +150,34 @@ class TestUcentralGatewayService(object): devices = json.loads(resp.text) print(devices) - resp = setup_controller.request("gw", "device/DEADBEEF0011", "GET", None, None) + resp = setup_controller.request("gw", "device/deadbeef0011", "GET", None, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw create device verify", body=body) if resp.status_code != 200: assert False - resp = setup_controller.request("gw", "device/DEADBEEF0011", "DELETE", None, None) + resp = setup_controller.request("gw", "device/deadbeef0011", "DELETE", None, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw create device delete", body=body) if resp.status_code != 200: assert False - + ''' @pytest.mark.sdk_restapi def test_gwservice_updatedevice(self, setup_controller): """ Test the update device endpoint WIFI-3454 """ - configuration = {'uuid': '1'} - payload = {'serialNumber': 'DEADBEEF0011', + payload = {'serialNumber': 'deadbeef0011', 'UUID': '123456', - 'configuration': configuration, + 'configuration': self.configuration, 'deviceType': 'AP', 'location': '', 'macAddress': 'DE:AD:BE:EF:00:11', 'manufacturer': 'Testing', 'owner': ''} - resp = setup_controller.request("gw", "device/DEADBEEF0011", "POST", None, json.dumps(payload)) + resp = setup_controller.request("gw", "device/deadbeef0011", "POST", None, json.dumps(payload)) + allure.attach(name="response: ", body=str(resp.json())) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw create devices", body=body) if resp.status_code != 200: @@ -87,15 +185,15 @@ class TestUcentralGatewayService(object): devices = json.loads(resp.text) print(devices) - payload = {'serialNumber': 'DEADBEEF0011', - 'owner': 'pytest'} - resp = setup_controller.request("gw", "device/DEADBEEF0011", "PUT", None, json.dumps(payload)) + payload = {'serialNumber': 'deadbeef0011', + 'notes': [{"note": "This is a test"}]} + resp = setup_controller.request("gw", "device/deadbeef0011", "PUT", None, json.dumps(payload)) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw get device", body=body) if resp.status_code != 200: assert False - resp = setup_controller.request("gw", "device/DEADBEEF0011", "GET", None, None) + resp = setup_controller.request("gw", "device/deadbeef0011", "GET", None, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw create device verify", body=body) if resp.status_code != 200: @@ -104,7 +202,7 @@ class TestUcentralGatewayService(object): device = json.loads(resp.text) print(device) - resp = setup_controller.request("gw", "device/DEADBEEF0011", "DELETE", None, None) + resp = setup_controller.request("gw", "device/deadbeef0011", "DELETE", None, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw get device", body=body) if resp.status_code != 200: @@ -116,16 +214,15 @@ class TestUcentralGatewayService(object): Test the delete device endpoint WIFI-3455 """ - configuration = {'uuid': '1'} - payload = {'serialNumber': 'DEADBEEF0011', + payload = {'serialNumber': 'deadbeef0011', 'UUID': '123456', - 'configuration': configuration, + 'configuration': self.configuration, 'deviceType': 'AP', - 'location': '', + 'location': 'testing', 'macAddress': 'DE:AD:BE:EF:00:11', 'manufacturer': 'Testing', 'owner': ''} - resp = setup_controller.request("gw", "device/DEADBEEF0011", "POST", None, json.dumps(payload)) + resp = setup_controller.request("gw", "device/deadbeef0011", "POST", None, json.dumps(payload)) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw create devices", body=body) if resp.status_code != 200: @@ -133,8 +230,9 @@ class TestUcentralGatewayService(object): devices = json.loads(resp.text) print(devices) - resp = setup_controller.request("gw", "device/DEADBEEF0011", "DELETE", None, None) + resp = setup_controller.request("gw", "device/deadbeef0011", "DELETE", None, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="gw get device", body=body) if resp.status_code != 200: assert False + ''' diff --git a/tests/controller_tests/ucentral_gateway/test_securityservice.py b/tests/controller_tests/ucentral_gateway/test_securityservice.py index 8c409c63d..962377e54 100644 --- a/tests/controller_tests/ucentral_gateway/test_securityservice.py +++ b/tests/controller_tests/ucentral_gateway/test_securityservice.py @@ -1,20 +1,20 @@ """ - UCentral Security Services Rest API Tests: Test Login, Logout API's + 2.x Security Services Rest API Tests: Test Login, Logout API's """ import pytest import json import allure - +@pytest.mark.uc_sanity @allure.feature("SDK REST API") class TestUcentralSecService(object): """ Test the oauth endpoint WIFI-3447 """ - + ''' @pytest.mark.sdk_restapi def test_secservice_oauth(self, setup_controller): """ @@ -36,7 +36,7 @@ class TestUcentralSecService(object): allure.attach(name="oauth revoke", body=body) assert resp.status_code == 204 setup_controller.login() - + ''' @pytest.mark.sdk_restapi def test_secservice_system_endpoints(self, setup_controller): """ @@ -59,13 +59,13 @@ class TestUcentralSecService(object): uri_present = 0 authtype_present = 0 for item in services['endpoints']: - if item['type'] == 'ucentralgw': + if item['type'] == 'owgw': num_services += 1 if item['uri'] is not None: uri_present += 1 if item['authenticationType'] is not None: authtype_present += 1 - elif item['type'] == 'ucentralfms': + elif item['type'] == 'owfms': num_services += 1 if item['uri'] is not None: uri_present += 1 @@ -81,7 +81,7 @@ class TestUcentralSecService(object): WIFI-3450 """ - params = {'command': 'version'} + params = {'command': 'info'} resp = setup_controller.request("sec", "system", "GET", params, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="security get version result", body=body) @@ -90,11 +90,9 @@ class TestUcentralSecService(object): assert False system = json.loads(resp.text) print(system) - if 'tag' not in system: + if 'version' not in system: assert False - if system['tag'] != 'version': - assert False - if not system['value']: + if system['version'] == '': assert False @pytest.mark.sdk_restapi @@ -104,7 +102,7 @@ class TestUcentralSecService(object): WIFI-3451 """ - params = {'command': 'times'} + params = {'command': 'info'} resp = setup_controller.request("sec", "system", "GET", params, None) body = resp.url + "," + str(resp.status_code) + ',' + resp.text allure.attach(name="security get uptime", body=body) @@ -112,16 +110,14 @@ class TestUcentralSecService(object): assert False system = json.loads(resp.text) print(system) - if 'times' not in system: + if 'uptime' not in system: assert False - valid_entities = 0 - for item in system['times']: - if item['tag'] == 'uptime': - valid_entities += 1 - if item['tag'] == 'start': - valid_entities += 1 - if item['value'] is not None: - valid_entities += 1 + if 'start' not in system: + assert False - assert (valid_entities == 4) + if system['uptime'] == '': + assert False + + if system['start'] == '': + assert False \ No newline at end of file diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py index 4bc818bb6..2bb310cd8 100644 --- a/tests/e2e/basic/conftest.py +++ b/tests/e2e/basic/conftest.py @@ -101,6 +101,12 @@ def station_names_fiveg(request, get_configuration): station_names.append(get_configuration["traffic_generator"]["details"]["5G-Station-Name"] + "0" + str(i)) yield station_names +@pytest.fixture(scope="session") +def station_names_ax(request, get_configuration): + station_names = [] + for i in range(0, int(request.config.getini("num_stations"))): + station_names.append(get_configuration["traffic_generator"]["details"]["AX-Station-Name"] + "0" + str(i)) + yield station_names @pytest.fixture(scope="session") def num_stations(request): diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py index 56ed57264..1b8208039 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py @@ -40,7 +40,7 @@ class TestDataplaneThroughputBRIDGE(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3913", name="WIFI-3913") @pytest.mark.wpa2_personal @pytest.mark.twog - def test_tcp_upd_wpa2_personal_bridge_2g_band(self, get_vif_state, lf_tools, + def test_tcp_upd_wpa2_personal_bridge_2g_band_ac_station(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput BRIDGE Mode @@ -54,9 +54,7 @@ class TestDataplaneThroughputBRIDGE(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - if ssid_name not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_twog, vlan_id=vlan) @@ -76,7 +74,8 @@ class TestDataplaneThroughputBRIDGE(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3914", name="WIFI-3914") @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_wpa2_personal_bridge_5g_band(self, get_vif_state, lf_tools, + @pytest.mark.nikita + def test_tcp_upd_wpa2_personal_bridge_5g_band_ac_station(self, get_vif_state, lf_tools, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput BRIDGE Mode pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and fiveg" @@ -89,9 +88,7 @@ class TestDataplaneThroughputBRIDGE(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - if ssid_name not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_fiveg, vlan_id=vlan) @@ -107,3 +104,73 @@ class TestDataplaneThroughputBRIDGE(object): assert station else: assert False + + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + def test_tcp_upd_wpa2_personal_bridge_5g_band_ax_station(self, get_vif_state, lf_tools, + lf_test, station_names_ax, create_lanforge_chamberview_dut, + get_configuration): + """Dataplane THroughput BRIDGE Mode + pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and fiveg" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "ax" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + + station = lf_test.Client_Connect(ssid=ssid_name, security=security, + passkey=security_key, mode=mode, band=band, + station_name=station_names_ax, vlan_id=vlan) + + if station: + dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, + instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE_AX", + vlan_id=vlan, dut_name=dut_name) + report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_ax) + assert station + else: + assert False + + + @pytest.mark.wpa2_personal + @pytest.mark.twog + def test_tcp_upd_wpa2_personal_bridge_2g_band_ax_station(self, get_vif_state, lf_tools, + lf_test, station_names_ax, create_lanforge_chamberview_dut, + get_configuration): + """Dataplane THroughput BRIDGE Mode + pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and twog" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "BRIDGE" + band = "ax" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + + station = lf_test.Client_Connect(ssid=ssid_name, security=security, + passkey=security_key, mode=mode, band=band, + station_name=station_names_ax, vlan_id=vlan) + + if station: + dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, + instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE_AX", + vlan_id=vlan, dut_name=dut_name) + report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") + lf_test.Client_disconnect(station_name=station_names_ax) + assert station + else: + assert False + + + diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py index b6b3fb5b8..018807f99 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_nat_mode.py @@ -40,7 +40,7 @@ class TestDataplaneThroughputNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3913", name="WIFI-3913") @pytest.mark.wpa2_personal @pytest.mark.twog - def test_tcp_upd_wpa2_personal_nat_2g_band(self, get_vif_state, lf_tools, + def test_tcp_upd_wpa2_personal_nat_2g_band_ac_station(self, get_vif_state, lf_tools, lf_test, station_names_twog, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode @@ -54,9 +54,6 @@ class TestDataplaneThroughputNAT(object): band = "twog" vlan = 1 dut_name = create_lanforge_chamberview_dut - if ssid_name not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_twog, vlan_id=vlan) @@ -75,7 +72,7 @@ class TestDataplaneThroughputNAT(object): @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3914", name="WIFI-3914") @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_wpa2_personal_nat_5g_band(self, get_vif_state, lf_tools, + def test_tcp_upd_wpa2_personal_nat_5g_band_ac_station(self, get_vif_state, lf_tools, lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode pytest -m "dataplane_throughput_test and nat and wpa2_personal and fiveg" @@ -88,9 +85,6 @@ class TestDataplaneThroughputNAT(object): band = "fiveg" vlan = 1 dut_name = create_lanforge_chamberview_dut - if ssid_name not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band, station_name=station_names_fiveg, vlan_id=vlan) @@ -106,3 +100,66 @@ class TestDataplaneThroughputNAT(object): assert station else: assert False + + @pytest.mark.wpa2_personal + @pytest.mark.twog + def test_tcp_upd_wpa2_personal_nat_2g_band_ax_station(self, get_vif_state, lf_tools, + lf_test, station_names_ax, create_lanforge_chamberview_dut, + get_configuration): + """Dataplane THroughput nat Mode + pytest -m "dataplane_throughput_test and nat and wpa2_personal and twog" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "NAT" + band = "ax" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + station = lf_test.Client_Connect(ssid=ssid_name, security=security, + passkey=security_key, mode=mode, band=band, + station_name=station_names_ax, vlan_id=vlan) + + if station: + dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, + instance_name="TIP_DPT_DPT_WPA2_2G_NAT_AX", + vlan_id=vlan, dut_name=dut_name) + report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") + lf_test.Client_disconnect(station_name=station_names_ax) + assert station + else: + assert False + + @pytest.mark.wpa2_personal + @pytest.mark.fiveg + def test_tcp_upd_wpa2_personal_nat_5g_band_aX_station(self, get_vif_state, lf_tools, + lf_test, station_names_ax, create_lanforge_chamberview_dut, + get_configuration): + """Dataplane THroughput nat Mode + pytest -m "dataplane_throughput_test and nat and wpa2_personal and fiveg" + """ + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] + security_key = profile_data["security_key"] + security = "wpa2" + mode = "NAT" + band = "ax" + vlan = 1 + dut_name = create_lanforge_chamberview_dut + station = lf_test.Client_Connect(ssid=ssid_name, security=security, + passkey=security_key, mode=mode, band=band, + station_name=station_names_ax, vlan_id=vlan) + + if station: + dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode, + instance_name="TIP_DPT_DPT_WPA2_5G_NAT_AX", + vlan_id=vlan, dut_name=dut_name) + report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") + print("Test Completed... Cleaning up Stations") + lf_test.Client_disconnect(station_name=station_names_ax) + assert station + else: + assert False \ No newline at end of file diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py index ebe0ce9cb..7e2921ace 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py @@ -55,7 +55,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -88,7 +88,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -121,7 +121,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -155,7 +155,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -189,7 +189,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnect_5g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -229,7 +229,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnect_2g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -304,7 +304,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal - def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -338,7 +338,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal - def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -372,7 +372,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -406,7 +406,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -440,7 +440,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -475,7 +475,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py index bacacd1ca..77ce5a014 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py @@ -59,7 +59,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, + def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -92,7 +92,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -125,7 +125,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -158,7 +158,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -191,7 +191,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnect_5g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_Open(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -230,7 +230,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnect_2g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_Open(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -304,7 +304,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal - def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -338,7 +338,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal - def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -372,7 +372,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -406,7 +406,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -440,7 +440,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -475,7 +475,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/android/test_general_security_modes.py index beaabe273..a05fac4fe 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/android/test_general_security_modes.py @@ -56,7 +56,7 @@ class TestBridgeModeConnectivitySuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -94,7 +94,7 @@ class TestBridgeModeConnectivitySuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -132,7 +132,7 @@ class TestBridgeModeConnectivitySuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnectivity_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_5g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -170,7 +170,7 @@ class TestBridgeModeConnectivitySuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnectivity_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_2g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -208,7 +208,7 @@ class TestBridgeModeConnectivitySuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnectivity_5g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_5g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -247,7 +247,7 @@ class TestBridgeModeConnectivitySuiteOne(object): @pytest.mark.twog @pytest.mark.open @pytest.mark.test_ClientConnectivity_2g_Open_and - def test_ClientConnectivity_2g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_2g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -327,7 +327,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.twog @allure.story('open 2.4 GHZ Band') - def test_wpa3_personal_ssid_2g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_ssid_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -366,7 +366,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.fiveg @allure.story('open 5 GHZ Band') - def test_wpa3_personal_ssid_5g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_ssid_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -405,7 +405,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal_mixed @pytest.mark.twog @allure.story('open 2.4 GHZ Band') - def test_wpa3_personal_mixed_ssid_2g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_mixed_ssid_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -444,7 +444,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal_mixed @pytest.mark.fiveg @allure.story('open 5 GHZ Band') - def test_wpa3_personal_mixed_ssid_5g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_mixed_ssid_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -483,7 +483,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa_wpa2_personal_mixed @pytest.mark.twog @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band') - def test_wpa_wpa2_personal_ssid_2g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa_wpa2_personal_ssid_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -522,7 +522,7 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.wpa_wpa2_personal_mixed @pytest.mark.fiveg @allure.story('wpa wpa2 personal mixed 5 GHZ Band') - def test_wpa_wpa2_personal_ssid_5g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa_wpa2_personal_ssid_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/iOS/test_general_security_modes.py index 8cd589676..6dc8dd7af 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connectivity_test/iOS/test_general_security_modes.py @@ -42,9 +42,9 @@ setup_params_general = { @allure.suite(suite_name="interop sanity") -@allure.sub_suite(sub_suite_name="Bridge Mode Client Connect : Suite-A") +@allure.sub_suite(sub_suite_name="Bridge Mode Client Connectivity : Suite-A") @pytest.mark.InteropsuiteA -@allure.feature("BRIDGE MODE CLIENT CONNECT") +@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -52,14 +52,14 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestBridgeModeConnectSuiteOne(object): - """ Client Connect SuiteA - pytest -m "client_connect and bridge and InteropsuiteA" +class TestBridgeModeConnectivitySuiteOneBridge(object): + """ Client Connectivity SuiteA + pytest -m "client_connectivity and bridge and InteropsuiteA" """ @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, + def test_ClientConnectivity_5g_WPA2_Personal_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -95,7 +95,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_WPA2_Personal_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -130,7 +130,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_WPA_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -165,7 +165,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_WPA_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -200,7 +200,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnect_5g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_Open_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -235,7 +235,7 @@ class TestBridgeModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnect_2g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_Open_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -294,9 +294,9 @@ setup_params_general_two = { @allure.suite(suite_name="interop sanity") -@allure.sub_suite(sub_suite_name="Bridge Mode Client Connect : Suite-B") +@allure.sub_suite(sub_suite_name="Bridge Mode Client Connectivity : Suite-B") @pytest.mark.InteropsuiteB -@allure.feature("BRIDGE MODE CLIENT CONNECT") +@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general_two], @@ -304,14 +304,14 @@ setup_params_general_two = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestBridgeModeConnectSuiteTwo(object): - """ Client Connect SuiteA - pytest -m "client_connect and bridge and InteropsuiteB" +class TestBridgeModeConnectivitySuiteBridgeTwo(object): + """ Client Connectivity SuiteA + pytest -m "client_connectivity and bridge and InteropsuiteB" """ @pytest.mark.fiveg @pytest.mark.wpa3_personal - def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_wpa3_personal_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -345,7 +345,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal - def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_wpa3_personal_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -379,7 +379,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_wpa3_personal_mixed_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -413,7 +413,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_wpa3_personal_mixed_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -447,7 +447,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_wpa_wpa2_personal_mixed_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -483,7 +483,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_wpa_wpa2_personal_mixed_BRIDGE(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/access_point_connection_test/iOS/test_AccessPointConnection.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/access_point_connection_test/iOS/test_AccessPointConnection.py index 25ab2b3bf..9d5a2acc6 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/access_point_connection_test/iOS/test_AccessPointConnection.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/access_point_connection_test/iOS/test_AccessPointConnection.py @@ -46,11 +46,11 @@ setup_params_general = { ) @pytest.mark.usefixtures("setup_profiles") -class TestAccessPointConnectivety(object): +class TestAccessPointConnectivetyNatMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_AccessPointConnection_5g_WPA2_Personal(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_5g_WPA2_Personal_NAT(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] @@ -81,7 +81,7 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_AccessPointConnection_2g_WPA2_Personal(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_2g_WPA2_Personal_NAT(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] @@ -112,7 +112,7 @@ class TestAccessPointConnectivety(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_AccessPointConnection_5g_WPA(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_5g_WPA_NAT(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -144,7 +144,7 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.wpa - def test_AccessPointConnection_2g_WPA(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): + def test_AccessPointConnection_2g_WPA_NAT(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] @@ -175,7 +175,7 @@ class TestAccessPointConnectivety(object): @pytest.mark.fiveg @pytest.mark.open - def test_AccessPointConnection_5g_OPEN(self, request, get_vif_state, get_AccessPointConn_data, + def test_AccessPointConnection_5g_OPEN_NAT(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] @@ -208,7 +208,7 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.open - def test_AccessPointConnection_2g_OPEN(self, request, get_vif_state, get_AccessPointConn_data, + def test_AccessPointConnection_2g_OPEN_NAT(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_general_security_modes.py index aeffba741..d4f2972be 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_general_security_modes.py @@ -55,7 +55,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -88,7 +88,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -122,7 +122,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -156,7 +156,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -190,7 +190,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnect_5g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -225,7 +225,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnect_2g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -300,7 +300,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal - def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -334,7 +334,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal - def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -368,7 +368,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -402,7 +402,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -436,7 +436,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -471,7 +471,7 @@ class TestBridgeModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_general_security_modes.py index 0c145a69e..4e9b123b3 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_general_security_modes.py @@ -59,7 +59,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, + def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -92,7 +92,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -125,7 +125,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -158,7 +158,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -191,7 +191,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnect_5g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_Open(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -230,7 +230,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnect_2g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_Open(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -304,7 +304,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal - def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -338,7 +338,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal - def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -372,7 +372,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -406,7 +406,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -440,7 +440,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -475,7 +475,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -521,7 +521,7 @@ class TestNatModeConnectSuiteTwo(object): # @pytest.mark.fiveg # @pytest.mark.open # @pytest.mark.sushant -# def test_AccessPointConnection_5g_OPEN_Nat(self, request, get_vif_state, get_APToMobileDevice_data, +# def test_AccessPointConnection_5g_OPEN_Nat(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, # setup_perfectoMobile_iOS): # profile_data = setup_params_general["ssid_modes"]["open"][1] # ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/android/test_general_security_modes.py index 2d75346b8..e19571290 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/android/test_general_security_modes.py @@ -56,7 +56,7 @@ class TestNatModeConnectivitySuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -94,7 +94,7 @@ class TestNatModeConnectivitySuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -132,7 +132,7 @@ class TestNatModeConnectivitySuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnectivity_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_5g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -170,7 +170,7 @@ class TestNatModeConnectivitySuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnectivity_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_2g_WPA(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -208,7 +208,7 @@ class TestNatModeConnectivitySuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnectivity_5g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_5g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -246,7 +246,7 @@ class TestNatModeConnectivitySuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnectivity_2g_Open(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_ClientConnectivity_2g_Open(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -326,7 +326,7 @@ class TestNatModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.twog @allure.story('open 2.4 GHZ Band') - def test_wpa3_personal_ssid_2g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_ssid_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -365,7 +365,7 @@ class TestNatModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.fiveg @allure.story('open 5 GHZ Band') - def test_wpa3_personal_ssid_5g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_ssid_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -404,7 +404,7 @@ class TestNatModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal_mixed @pytest.mark.twog @allure.story('open 2.4 GHZ Band') - def test_wpa3_personal_mixed_ssid_2g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_mixed_ssid_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -443,7 +443,7 @@ class TestNatModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal_mixed @pytest.mark.fiveg @allure.story('open 5 GHZ Band') - def test_wpa3_personal_mixed_ssid_5g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa3_personal_mixed_ssid_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -482,7 +482,7 @@ class TestNatModeConnectivitySuiteTwo(object): @pytest.mark.wpa_wpa2_personal_mixed @pytest.mark.twog @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band') - def test_wpa_wpa2_personal_ssid_2g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa_wpa2_personal_ssid_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -521,7 +521,7 @@ class TestNatModeConnectivitySuiteTwo(object): @pytest.mark.wpa_wpa2_personal_mixed @pytest.mark.fiveg @allure.story('wpa wpa2 personal mixed 5 GHZ Band') - def test_wpa_wpa2_personal_ssid_5g(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): + def test_wpa_wpa2_personal_ssid_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/iOS/test_general_security_modes.py index c833e704d..9658fe02a 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connectivity_test/iOS/test_general_security_modes.py @@ -42,9 +42,9 @@ setup_params_general = { @allure.suite(suite_name="interop sanity") -@allure.sub_suite(sub_suite_name="Nat Mode Client Connect : Suite-A") +@allure.sub_suite(sub_suite_name="Nat Mode Client Connectivity : Suite-A") @pytest.mark.InteropsuiteA -@allure.feature("NAT MODE CLIENT CONNECT") +@allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -52,14 +52,14 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestNatModeConnectSuiteOne(object): - """ Client Connect SuiteA - pytest -m "client_connect and nat and InteropsuiteA" +class TestNatModeConnectivitySuiteNatOne(object): + """ Client Connectivity SuiteA + pytest -m "client_connectivity and nat and InteropsuiteA" """ @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ClientConnect_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, + def test_ClientConnectivity_5g_WPA2_Personal_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -95,7 +95,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnect_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_WPA2_Personal_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -130,7 +130,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ClientConnect_5g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_WPA_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -165,7 +165,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.wpa - def test_ClientConnect_2g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_WPA_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -200,7 +200,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.fiveg @pytest.mark.open - def test_ClientConnect_5g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_Open_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -235,7 +235,7 @@ class TestNatModeConnectSuiteOne(object): @pytest.mark.twog @pytest.mark.open - def test_ClientConnect_2g_Open(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_Open_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] @@ -294,9 +294,9 @@ setup_params_general_two = { @allure.suite(suite_name="interop sanity") -@allure.sub_suite(sub_suite_name="Nat Mode Client Connect : Suite-B") +@allure.sub_suite(sub_suite_name="Nat Mode Client Connectivity : Suite-B") @pytest.mark.InteropsuiteB -@allure.feature("NAT MODE CLIENT CONNECT") +@allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general_two], @@ -304,14 +304,14 @@ setup_params_general_two = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestNatModeConnectSuiteTwo(object): +class TestNatModeConnectivitySuiteNatTwo(object): """ Client Connect SuiteA - pytest -m "client_connect and nat and InteropsuiteB" + pytest -m "client_connectivity and nat and InteropsuiteB" """ @pytest.mark.fiveg @pytest.mark.wpa3_personal - def test_ClientConnect_5g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_wpa3_personal_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][1] ssidName = profile_data["ssid_name"] @@ -345,7 +345,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal - def test_ClientConnect_2g_wpa3_personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_wpa3_personal_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal"][0] ssidName = profile_data["ssid_name"] @@ -379,7 +379,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_5g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_wpa3_personal_mixed_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -413,7 +413,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa3_personal_mixed - def test_ClientConnect_2g_wpa3_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_wpa3_personal_mixed_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa3_personal_mixed"][0] ssidName = profile_data["ssid_name"] @@ -447,7 +447,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.fiveg @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_5g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_5g_wpa_wpa2_personal_mixed_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][1] ssidName = profile_data["ssid_name"] @@ -482,7 +482,7 @@ class TestNatModeConnectSuiteTwo(object): @pytest.mark.twog @pytest.mark.wpa_wpa2_personal_mixed - def test_ClientConnect_2g_wpa_wpa2_personal_mixed(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_iOS): + def test_ClientConnectivity_2g_wpa_wpa2_personal_mixed_NAT(self, request, get_vif_state, get_ap_logs, get_APToMobileDevice_data, setup_perfectoMobile_iOS): profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_ToggleAirplaneMode.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_ToggleAirplaneMode.py index d821210e5..61f474f65 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_ToggleAirplaneMode.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_ToggleAirplaneMode.py @@ -47,11 +47,11 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestToggleAirplaneMode(object): +class TestToggleAirplaneModeNatMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ToogleAirplaneMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, + def test_ToogleAirplaneMode_5g_WPA2_Personal_NAT(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] @@ -83,7 +83,7 @@ class TestToggleAirplaneMode(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ToogleAirplaneMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, + def test_ToogleAirplaneMode_2g_WPA2_Personal_NAT(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] @@ -116,7 +116,7 @@ class TestToggleAirplaneMode(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ToogleAirplaneMode_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, + def test_ToogleAirplaneMode_5g_WPA_NAT(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -146,7 +146,7 @@ class TestToggleAirplaneMode(object): @pytest.mark.twog @pytest.mark.wpa - def test_ToogleAirplaneMode_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, + def test_ToogleAirplaneMode_2g_WPA_NAT(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -176,7 +176,7 @@ class TestToggleAirplaneMode(object): @pytest.mark.open @pytest.mark.fiveg - def test_ToogleAirplaneMode_5g_OPEN(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): + def test_ToogleAirplaneMode_5g_OPEN_NAT(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -208,7 +208,7 @@ class TestToggleAirplaneMode(object): @pytest.mark.open @pytest.mark.twog - def test_ToogleAirplaneMode_2g_OPEN(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): + def test_ToogleAirplaneMode_2g_OPEN_NAT(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_ToggleWifiMode.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_ToggleWifiMode.py index 7b0709da5..c22e1eb07 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_ToggleWifiMode.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_ToggleWifiMode.py @@ -47,11 +47,11 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestToggleWifiMode(object): +class TestToggleWifiModeNatMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ToogleWifiMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, + def test_ToogleWifiMode_5g_WPA2_Personal_NAT(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -83,7 +83,7 @@ class TestToggleWifiMode(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ToogleWifiMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, + def test_ToogleWifiMode_2g_WPA2_Personal_NAT(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -115,7 +115,7 @@ class TestToggleWifiMode(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ToogleWifiMode_5g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): + def test_ToogleWifiMode_5g_WPA_NAT(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] @@ -146,7 +146,7 @@ class TestToggleWifiMode(object): @pytest.mark.twog @pytest.mark.wpa - def test_ToogleWifiMode_2g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): + def test_ToogleWifiMode_2g_WPA_NAT(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] @@ -177,7 +177,7 @@ class TestToggleWifiMode(object): @pytest.mark.fiveg @pytest.mark.open - def test_ToogleWifiMode_5g_OPEN(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): + def test_ToogleWifiMode_5g_OPEN_NAT(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][1] ssidName = profile_data["ssid_name"] @@ -208,7 +208,7 @@ class TestToggleWifiMode(object): @pytest.mark.twog @pytest.mark.open - def test_ToogleWifiMode_2g_OPEN(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): + def test_ToogleWifiMode_2g_OPEN_NAT(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["open"][0] ssidName = profile_data["ssid_name"] diff --git a/tests/pytest.ini b/tests/pytest.ini index a81e84e74..e52eff70f 100644 --- a/tests/pytest.ini +++ b/tests/pytest.ini @@ -37,7 +37,7 @@ milestone=29 #--- Perfecto parameters ----- perfectoURL=tip -securityToken=eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MjE4NjgyOTksImp0aSI6IjIzNGFiOTM1LWIxYjQtNGZiOC1hZmJiLTM0OTQwNzU5MjIwMyIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiN2I1MzBhZTAtODgxOC00N2I5LTgzZjMtN2ZhMGZiMGRkYjRlIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI1MzI2NDQxNS0xYTQwLTQ1ZTctOGVkMi1hOTNiYWZmZWNjYjIiLCJzZXNzaW9uX3N0YXRlIjoiY2YzY2JlOGMtY2Y5OC00NzRlLWJmODctYTIxNzU0NzVhM2EzIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.4a4v6AKxmY95Zb-l84K_Od49WPikwOHP7ryctfmnn-w +securityToken=eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MzI4Mzc2NDEsImp0aSI6IjAwZGRiYWY5LWQwYjMtNDRjNS1hYjVlLTkyNzFlNzc5ZGUzNiIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiODNkNjUxMWQtNTBmZS00ZWM5LThkNzAtYTA0ZjBkNTdiZDUyIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI2ZjE1YzYxNy01YTU5LTQyOWEtODc2Yi1jOTQxMTQ1ZDFkZTIiLCJzZXNzaW9uX3N0YXRlIjoiYmRjZTFmYTMtMjlkYi00MmFmLWI5YWMtYjZjZmJkMDEyOTFhIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.5R85_1R38ZFXv_wIjjCIsj8NJm1p66dCsLJI5DBEmks #PS Token #securityToken=eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIyODhhNDIyNS1jOTE1LTQwZDctOTc2YS04MDhiMWE3YTFmODYifQ.eyJpYXQiOjE2MjA4NTU1NTcsImp0aSI6IjNiMWJiNWNhLTkzOTgtNDViOC04YmZkLTAxNjdhNGZjNDY1NCIsImlzcyI6Imh0dHBzOi8vYXV0aC5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvcHMtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy9wcy1wZXJmZWN0b21vYmlsZS1jb20iLCJzdWIiOiIzOTNiMzFhNC00MmJlLTQ2YjEtODkwZS1iZGU3NjdlYTNiNDYiLCJ0eXAiOiJPZmZsaW5lIiwiYXpwIjoib2ZmbGluZS10b2tlbi1nZW5lcmF0b3IiLCJub25jZSI6IjI3MTY4ZjBmLTdlMmItNGI3YS1hZjNjLWFhMGE1NjhkZjE2ZCIsInNlc3Npb25fc3RhdGUiOiJlOWZjZTQ5Mi05NDA3LTQ1ZDItYjU4NS02ZDFiNTAzYzM4ZTUiLCJzY29wZSI6Im9wZW5pZCBvZmZsaW5lX2FjY2VzcyJ9.Z_rJHVkrmR26fZ366yLUSkt2oZX4a8KN7IRCd_QG3qo #demo Cloud diff --git a/tools/interop_tools.py b/tools/interop_tools.py new file mode 100644 index 000000000..ba86fb795 --- /dev/null +++ b/tools/interop_tools.py @@ -0,0 +1,160 @@ +#!/usr/bin/python3.9 +""" + + interop_tools : Tools for Interop + reboot + ./interop_tools --device "{\"Galaxy S9\":\"Android\"}" --project_name "" --job_name "" --job_number 1 --test_tag "" --test_case_name "" + ./interop_tools --device "{\"Galaxy S9\":\"Android\"}" --job_number 1 +""" + +import sys + +if "libs" not in sys.path: + sys.path.append("../libs/perfecto_libs/") + +import argparse +import paramiko + + +import datetime +import sys +import os +import time +import warnings +from _pytest.outcomes import xfail +import urllib3 +from perfecto.model.model import Job, Project +from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient,TestContext, TestResultFactory) +import pytest +import logging +import re +from selenium.common.exceptions import NoSuchElementException, TimeoutException +from selenium.webdriver.common.by import By +from selenium.webdriver.support.ui import WebDriverWait +from appium.webdriver.common.mobileby import MobileBy +from selenium.webdriver.support import expected_conditions as EC +from appium import webdriver + +from android_lib import * +from iOS_lib import * +import json +import ast +# device = iPhone-12, iPhone-11, iPhone-7 ,platform_name=iOS +# device = Galaxy S20, Galaxy S10.*, Galaxy S9, Pixel 4, platform_name = Android + +class perfecto_tools: + + def __init__(self, project_name="TIP-test-Execution", job_name="reboot-devices", job_number=1, + test_tag="TIP-PyTest-Execution", test_case_name="reboot", device="iPhone-12", + platform_name="iOS", browser_name="mobileOS"): + warnings.simplefilter("ignore", ResourceWarning) + urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) + + self.driver = None + self.reporting_client = None + self.projectname = project_name + self.projectversion = 1.0 + self.jobname = job_name + self.jobnumber = job_number + self.tags = test_tag + self.device = device # iPhone-11 + self.testCaseName = test_case_name + self.platform_name = platform_name # iOS + self.browser_name = browser_name + self.capabilities = { + 'platformName': self.platform_name, + 'model': self.device, + 'browserName': self.browser_name, + 'securityToken': 'eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJpYXQiOjE2MzI4Mzc2NDEsImp0aSI6IjAwZGRiYWY5LWQwYjMtNDRjNS1hYjVlLTkyNzFlNzc5ZGUzNiIsImlzcyI6Imh0dHBzOi8vYXV0aDIucGVyZmVjdG9tb2JpbGUuY29tL2F1dGgvcmVhbG1zL3RpcC1wZXJmZWN0b21vYmlsZS1jb20iLCJhdWQiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwic3ViIjoiODNkNjUxMWQtNTBmZS00ZWM5LThkNzAtYTA0ZjBkNTdiZDUyIiwidHlwIjoiT2ZmbGluZSIsImF6cCI6Im9mZmxpbmUtdG9rZW4tZ2VuZXJhdG9yIiwibm9uY2UiOiI2ZjE1YzYxNy01YTU5LTQyOWEtODc2Yi1jOTQxMTQ1ZDFkZTIiLCJzZXNzaW9uX3N0YXRlIjoiYmRjZTFmYTMtMjlkYi00MmFmLWI5YWMtYjZjZmJkMDEyOTFhIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.5R85_1R38ZFXv_wIjjCIsj8NJm1p66dCsLJI5DBEmks', + 'useAppiumForWeb': 'false', + 'useAppiumForHybrid': 'false', + } + self.app_data = { + "webURL": "https://www.google.com", + "lblSearch": "//*[@class='gLFyf']", + "elelSearch": "(//*[@class='sbic sb43'])[1]", + "BtnRunSpeedTest": "//*[text()='RUN SPEED TEST']", + "bundleId-iOS-Settings": 'com.apple.Preferences', + "bundleId-iOS-Safari": 'com.apple.mobilesafari', + "downloadMbps": "//*[@id='knowledge-verticals-internetspeedtest__download']/P[@class='spiqle']", + "UploadMbps": "//*[@id='knowledge-verticals-internetspeedtest__upload']/P[@class='spiqle']", + # Android + "platformName-android": 'Android', + "appPackage-android": 'com.android.settings' + } + + self.driver = webdriver.Remote( + "https://tip.perfectomobile.com/nexperience/perfectomobile/wd/hub", + self.capabilities + ) + self.device_model_name = self.driver.execute_script('mobile:handset:info', {'property': 'model'}) + self.perfecto_execution_context = PerfectoExecutionContext(self.driver, self.tags, Job(self.jobname, self.jobnumber), + Project(self.projectname, self.projectversion)) + self.reporting_client = PerfectoReportiumClient(self.perfecto_execution_context) + self.reporting_client.test_start(test_case_name, TestContext([], "Perforce")) + + def driver_wait(self, time): + self.driver.implicitly_wait(time) + + def reboot(self): + params = {} + print("rebooting..",self.device_model_name) + self.driver.execute_script('mobile:handset:reboot', params) + print("rebooting complete !!") + + +def main(): + parser = argparse.ArgumentParser(prog="interop_tools", + formatter_class=argparse.RawTextHelpFormatter, + allow_abbrev=True, + epilog="About interop_tools.py", + description="Tools for Interop") + + parser.add_argument('--device', type=str, help=' --device : device you want to reboot', + default="{\"Galaxy S20\": 'Android', \"Galaxy S10.*\": 'Android', \"Galaxy S9\": 'Android', \"Pixel 4\": 'Android',\"iPhone-12\": 'iOS', \"iPhone-11\": 'iOS', \"iPhone-7\" : 'iOS'}") + + parser.add_argument('--project_name', type=str, help='', default="TIP-test-Execution") + parser.add_argument('--job_name', type=str, help='', default="reboot-devices") + parser.add_argument('--job_number', type=int, help='', default=1) + parser.add_argument('--test_tag', type=str, help='', default="TIP-PyTest-Execution") + parser.add_argument('--test_case_name', type=str, help='', default="reboot") + + args = parser.parse_args() + devices = args.device + print(devices) + device = ast.literal_eval(devices) + job_name = args.job_name + job_number = args.job_number + test_tag = args.test_tag + test_case_name = args.test_case_name + + + for device_name,platform in device.items(): + try: + perfecto_tool = perfecto_tools(device=device_name, + platform_name=platform, + job_name=job_name, + job_number=job_number, + test_tag=test_tag, + test_case_name=str(test_case_name+"-"+device_name)) + try: + perfecto_tool.reboot() + perfecto_tool.reporting_client.test_stop(TestResultFactory.create_success()) + except: + print("Reboot Failed !") + perfecto_tool.reporting_client.test_stop(TestResultFactory.create_failure("Failed!")) + finally: + try: + perfecto_tool.driver.close() + except: + print("not able to close the driver") + try: + perfecto_tool.driver.quit() + except: + print("not able to quit the driver") + except: + print("Failed to get Driver") + + +if __name__ == '__main__': + main()