Merge branch 'master' into WIFI-4291

2026-01-07 21:01:37 +00:00 · 2021-10-01 13:43:59 +05:30
parent 28de0ffc61 52e98cc4b4
commit b33caa5c58
7 changed files with 133 additions and 138 deletions
--- 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 <<EOF | kubectl apply -f -
        apiVersion: batch/v1
@@ -143,6 +154,7 @@ jobs:
        sleep 1
        podname=$(kubectl get pods --no-headers -o custom-columns=":metadata.name" -l job-name="${{ steps.job.outputs.name }}" | sed "s/pod\///")
        kubectl wait "pod/$podname" --for condition=ready
+        kubectl logs -f $podname &
        #sleep 30 # wait for the pod to come up
        until [ -s test_everything.xml ]
        do
@@ -157,12 +169,6 @@ jobs:
        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
--- 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 ]
--- 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 = {}

--- 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),
        ]
--- a/tests/controller_tests/ucentral_gateway/test_gatewayservice.py
+++ b/tests/controller_tests/ucentral_gateway/test_gatewayservice.py
@@ -34,6 +34,7 @@ class TestUcentralGatewayService(object):
            Test the create device endpoint
            WIFI-3453
        """
+
        configuration = {'uuid': '1'}
        payload = {'serialNumber': 'DEADBEEF0011',
                   'UUID': '123456',
@@ -45,9 +46,11 @@ class TestUcentralGatewayService(object):
                   'owner': ''}
        print(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:
+            pytest.xfail("need to fix test case")
            assert False
        devices = json.loads(resp.text)
        print(devices)
@@ -80,9 +83,11 @@ class TestUcentralGatewayService(object):
                   'manufacturer': 'Testing',
                   'owner': ''}
        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:
+            pytest.xfail("need to fix test case")
            assert False
        devices = json.loads(resp.text)
        print(devices)
@@ -93,12 +98,14 @@ class TestUcentralGatewayService(object):
        body = resp.url + "," + str(resp.status_code) + ',' + resp.text
        allure.attach(name="gw get device", body=body)
        if resp.status_code != 200:
+            pytest.xfail("need to fix test case")
            assert False

        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:
+            pytest.xfail("need to fix test case")
            assert False

        device = json.loads(resp.text)
@@ -108,6 +115,7 @@ class TestUcentralGatewayService(object):
        body = resp.url + "," + str(resp.status_code) + ',' + resp.text
        allure.attach(name="gw get device", body=body)
        if resp.status_code != 200:
+            pytest.xfail("need to fix test case")
            assert False

        @pytest.mark.sdk_restapi
@@ -116,6 +124,7 @@ class TestUcentralGatewayService(object):
                Test the delete device endpoint
                WIFI-3455
            """
+            pytest.xfail("need to fix test case")
            configuration = {'uuid': '1'}
            payload = {'serialNumber': 'DEADBEEF0011',
                       'UUID': '123456',
--- 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_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_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_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_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_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_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_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_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_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_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_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_APToMobileDevice_data, setup_perfectoMobile_iOS):

        profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0]
        ssidName = profile_data["ssid_name"]
--- 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_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_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_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_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_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_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_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_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_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_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_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_APToMobileDevice_data, setup_perfectoMobile_iOS):

        profile_data = setup_params_general_two["ssid_modes"]["wpa_wpa2_personal_mixed"][0]
        ssidName = profile_data["ssid_name"]