scottk/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2025-10-31 02:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to JSON lab configuration (#405)

Browse Source 
Signed-off-by: Max Brenner <xamrennerb@gmail.com>
This commit is contained in:
Max
2022-02-28 12:06:29 +01:00
committed by GitHub
parent 95146bf524
commit 6f6c4b9d9a
12 changed files with 57 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/actions/run-tests/action.yml vendored
View File

@@ -46,17 +46,17 @@ runs:
id: job id: job
run: echo "::set-output name=name::testing" run: echo "::set-output name=name::testing"
- name: create configuration.py secret - name: create configuration secret
shell: bash shell: bash
run: | run: |
if [ -n "${{ inputs.configuration_file }}" ]; then if [ -n "${{ inputs.configuration_file }}" ]; then
kubectl create secret generic configuration --from-file=configuration=${{ inputs.configuration_file }} kubectl create secret generic configuration --from-file=configuration=${{ inputs.configuration_file }}
else else
cat << EOF > configuration.py cat << EOF > lab_info.json
${{ inputs.configuration || 'configuration missing' }} ${{ inputs.configuration || 'configuration missing' }}
EOF EOF
kubectl create secret generic configuration --from-file=configuration=./configuration.py kubectl create secret generic configuration --from-file=configuration=./lab_info.json
fi fi
- name: run tests - name: run tests
@@ -103,7 +103,7 @@ runs:
exit \$ret exit \$ret
volumeMounts: volumeMounts:
- name: configuration - name: configuration
mountPath: "/wlan-testing/tests/configuration.py" mountPath: "/wlan-testing/tests/lab_info.json"
subPath: configuration subPath: configuration
readOnly: true readOnly: true
nodeSelector: nodeSelector:

2
.github/workflows/advanced.yml vendored
View File

@@ -66,7 +66,7 @@ jobs:
namespace: ${{ steps.namespace.outputs.name }} namespace: ${{ steps.namespace.outputs.name }}
testbed: ${{ matrix.testbed }} testbed: ${{ matrix.testbed }}
marker_expression: advance marker_expression: advance
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.testbed }} allure_results_artifact_name: allure-results-${{ matrix.testbed }}

2
.github/workflows/get_redirector_url.yml vendored
View File

@@ -53,7 +53,7 @@ jobs:
- name: create configuration.py file - name: create configuration.py file
run: | run: |
cat << EOF > configuration.py cat << EOF > configuration.py
${{ secrets.LAB_CONFIGURATION }} ${{ secrets.LAB_CONFIGURATION_JSON }}
EOF EOF
- name: Get redirector URL - name: Get redirector URL

16
.github/workflows/interop.yml vendored
View File

@@ -71,7 +71,7 @@ jobs:
namespace: interop-${{ github.run_id }}-galaxy-s9 namespace: interop-${{ github.run_id }}-galaxy-s9
testbed: interop-01 testbed: interop-01
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android and not wpa3_personal' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android and not wpa3_personal' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-android='Galaxy S9' -o 'jobName=Github-Interop-galaxy-s9' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-android='Galaxy S9' -o 'jobName=Github-Interop-galaxy-s9' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-galaxy-s9 allure_results_artifact_name: allure-results-galaxy-s9
@@ -98,7 +98,7 @@ jobs:
namespace: interop-${{ github.run_id }}-iphone-12 namespace: interop-${{ github.run_id }}-iphone-12
testbed: interop-01 testbed: interop-01
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-iOS='iPhone-12' -o 'jobName=Github-Interop-iphone-12' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-iOS='iPhone-12' -o 'jobName=Github-Interop-iphone-12' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-iphone-12 allure_results_artifact_name: allure-results-iphone-12
@@ -126,7 +126,7 @@ jobs:
namespace: interop-${{ github.run_id }}-galaxy-s10 namespace: interop-${{ github.run_id }}-galaxy-s10
testbed: interop-02 testbed: interop-02
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-android='Galaxy S10.*' -o 'jobName=Github-Interop-galaxy-s10' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-android='Galaxy S10.*' -o 'jobName=Github-Interop-galaxy-s10' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-galaxy-s10 allure_results_artifact_name: allure-results-galaxy-s10
@@ -153,7 +153,7 @@ jobs:
namespace: interop-${{ github.run_id }}-iphone-7 namespace: interop-${{ github.run_id }}-iphone-7
testbed: interop-02 testbed: interop-02
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-iOS='iPhone-7' -o 'jobName=Github-Interop-iphone-7' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-iOS='iPhone-7' -o 'jobName=Github-Interop-iphone-7' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-iphone-7 allure_results_artifact_name: allure-results-iphone-7
@@ -181,7 +181,7 @@ jobs:
namespace: interop-${{ github.run_id }}-galaxy-s20 namespace: interop-${{ github.run_id }}-galaxy-s20
testbed: interop-03 testbed: interop-03
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-android='Galaxy S20' -o 'jobName=Github-Interop-galaxy-s20' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-android='Galaxy S20' -o 'jobName=Github-Interop-galaxy-s20' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-galaxy-s20 allure_results_artifact_name: allure-results-galaxy-s20
@@ -208,7 +208,7 @@ jobs:
namespace: interop-${{ github.run_id }}-iphone-xr namespace: interop-${{ github.run_id }}-iphone-xr
testbed: interop-03 testbed: interop-03
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-iOS='iPhone-XR' -o 'jobName=Github-Interop-iphone-xr' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-iOS='iPhone-XR' -o 'jobName=Github-Interop-iphone-xr' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-iphone-xr allure_results_artifact_name: allure-results-iphone-xr
@@ -236,7 +236,7 @@ jobs:
namespace: interop-${{ github.run_id }}-pixel-4 namespace: interop-${{ github.run_id }}-pixel-4
testbed: interop-04 testbed: interop-04
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and android' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-android='Pixel 4' -o 'jobName=Github-Interop-pixel-4' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-android='Pixel 4' -o 'jobName=Github-Interop-pixel-4' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-pixel-4 allure_results_artifact_name: allure-results-pixel-4
@@ -263,7 +263,7 @@ jobs:
namespace: interop-${{ github.run_id }}-iphone-11 namespace: interop-${{ github.run_id }}-iphone-11
testbed: interop-04 testbed: interop-04
marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}" marker_expression: "${{ needs.vars.outputs.marker_overwrite || 'interop_uc_sanity and client_connect and ios' }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o model-iOS='iPhone-11' -o 'jobName=Github-Interop-iphone-11' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge" additional_args: "-o model-iOS='iPhone-11' -o 'jobName=Github-Interop-iphone-11' -o 'jobNumber=${{ github.run_number }}' --skip-lanforge"
allure_results_artifact_name: allure-results-iphone-11 allure_results_artifact_name: allure-results-iphone-11

2
.github/workflows/manual.yml vendored
View File

@@ -81,7 +81,7 @@ jobs:
namespace: "manual-${{ github.run_id }}-${{ github.event.inputs.testbed }}" namespace: "manual-${{ github.run_id }}-${{ github.event.inputs.testbed }}"
testbed: "${{ github.event.inputs.testbed }}" testbed: "${{ github.event.inputs.testbed }}"
marker_expression: "${{ github.event.inputs.marker_expression }}" marker_expression: "${{ github.event.inputs.marker_expression }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: "-o firmware=${{ github.event.inputs.firmware }} ${{ github.event.inputs.additional_args }}" additional_args: "-o firmware=${{ github.event.inputs.firmware }} ${{ github.event.inputs.additional_args }}"
allure_results_artifact_name: allure-results allure_results_artifact_name: allure-results

12
.github/workflows/ow_docker-compose.yml vendored
View File

@@ -358,13 +358,13 @@ jobs:
NAMESPACE="testing-${{ github.run_id }}" NAMESPACE="testing-${{ github.run_id }}"
echo "::set-output name=name::${NAMESPACE}" echo "::set-output name=name::${NAMESPACE}"
- name: create configuration.py secret - name: create configuration secret
run: | run: |
cat << EOF > configuration.py cat << EOF > lab_info.json
${{ secrets.LAB_CONFIGURATION }} ${{ secrets.LAB_CONFIGURATION_JSON }}
EOF EOF
sed -i -r "s/'url': ('|\").*('|\")/'url': 'https:\/\/${{ needs.deploy-controller.outputs.sec_url }}:16001'/" configuration.py jq '.CONFIGURATION["${{ github.event.inputs.testbeds || 'basic-05' }}"].controller.url="https://${{ needs.deploy-controller.outputs.sec_url }}:16001"' lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
sed -i -r "s/'password': ('|\")openwifi('|\")/'password': '"${{ secrets.OWSEC_NEW_PASSWORD }}"'/" configuration.py jq '.CONFIGURATION["${{ github.event.inputs.testbeds || 'basic-05' }}"].controller.password="${{ secrets.OWSEC_NEW_PASSWORD }}"' lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
- name: run tests - name: run tests
uses: ./.github/actions/run-tests uses: ./.github/actions/run-tests
@@ -372,7 +372,7 @@ jobs:
namespace: ${{ steps.namespace.outputs.name }} namespace: ${{ steps.namespace.outputs.name }}
testbed: "${{ github.event.inputs.testbeds || 'basic-05' }}" testbed: "${{ github.event.inputs.testbeds || 'basic-05' }}"
marker_expression: "${{ github.event.inputs.marker_expression || 'sdk_restapi' }}" marker_expression: "${{ github.event.inputs.marker_expression || 'sdk_restapi' }}"
configuration_file: "./configuration.py" configuration_file: "./lab_info.json"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-docker-compose-${{ github.event.inputs.marker_expression || 'sdk_restapi' }} allure_results_artifact_name: allure-results-docker-compose-${{ github.event.inputs.marker_expression || 'sdk_restapi' }}

2
.github/workflows/performance.yml vendored
View File

@@ -77,7 +77,7 @@ jobs:
namespace: ${{ steps.namespace.outputs.name }} namespace: ${{ steps.namespace.outputs.name }}
testbed: ${{ steps.testbed.outputs.name }} testbed: ${{ steps.testbed.outputs.name }}
marker_expression: "performance and ${{ matrix.marker }}" marker_expression: "performance and ${{ matrix.marker }}"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.marker }} allure_results_artifact_name: allure-results-${{ matrix.marker }}

140
.github/workflows/quali-advanced.yml vendored
View File

@@ -133,148 +133,20 @@ jobs:
- name: prepare configuration - name: prepare configuration
run: | run: |
cat << EOF > configuration.py cat << EOF > lab_info.json
Customer = "" ${{ secrets.LAB_CONFIGURATION_JSON }}
server = ""
CONFIGURATION = {
"advanced": $(python .quali/get_configuration.py ${{ steps.reservation.outputs.identifier }})
}
open_flow = {}
RADIUS_SERVER_DATA = {
"ip": "10.10.1.221",
"port": 1812,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
RADIUS_ACCOUNTING_DATA = {
"ip": "10.10.1.221",
"port": 1813,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
DYNAMIC_VLAN_RADIUS_SERVER_DATA = {
"ip": "3.20.165.131",
"port": 1812,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA = {
"ip": "3.20.165.131",
"port": 1813,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
PASSPOINT_RADIUS_SERVER_DATA = {
"ip": "52.234.179.191",
"port": 11812,
"secret": "yeababy20!",
"user": "nolaradius",
"password": "nolastart",
"pk_password": "whatever"
}
PASSPOINT_RADIUS_ACCOUNTING_SERVER_DATA = {
"ip": "52.234.179.191",
"port": 11813,
"secret": "yeababy20!"
}
PASSPOINT_PROVIDER_INFO = {
"mcc": None,
"mnc": None,
"network": None,
"nai_realms": {
"domain": "oss.ameriband.com",
"encoding": 0,
"eap_map": {"EAP-TTLS with username/password": ["Credential Type:username/password",
"Non-EAP Inner Authentication Type:MSCHAPV2"]}
},
"osu_nai_standalone": "anonymous@ameriband.com",
"osu_nai_shared": "anonymous@ameriband.com",
"roaming_oi": []
}
RATE_LIMITING_RADIUS_SERVER_DATA = {
"ip": "18.189.85.200",
"port": 1812,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
RATE_LIMITING_RADIUS_ACCOUNTING_DATA = {
"ip": "18.189.85.200",
"port": 1813,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
PASSPOINT_OPERATOR_INFO = {
"osen": "Disabled",
"domain_name_list": ["telecominfraproject.atlassian.net"],
"operator_names": [
{"locale": "eng", "name": "Default friendly passpoint_operator name"},
{"locale": "fra", "name": "Nom de l'opérateur convivial par défaut"}
]
}
PASSPOINT_VENUE_INFO = {
"venue_type": {"group": "Business", "type": "Police Station"},
"venue_names": [
{"locale": "eng", "name": "Example passpoint_venue", "url": "http://www.example.com/info-eng"},
{"locale": "fra", "name": "Exemple de lieu", "url": "http://www.example.com/info-fra"}
]
}
PASSPOINT_PROFILE_INFO = {
"profile_download_url_ios": "https://onboard.almondlabs.net/ttls/AmeriBand-Profile.mobileconfig",
"profile_download_url_android": "https://onboard.almondlabs.net/ttls/androidconfig.cfg",
"profile_name_on_device": "AmeriBand",
"radius_configuration": {
"user_defined_nas_id": "FB001AP001",
"operator_id": "AmeribandTIP",
"radius_acounting_service_interval": 60
},
"interworking_hs2dot0": "Enabled",
"hessid": None,
"access_network": {
"Access Network Type": "Free Public Network",
"Authentication Type": "Acceptance of Terms & Conditions",
"Emergency Services Reachable": "Enabled",
"Unauthenticated Emergency Service": "Disabled",
},
"ip_connectivity": {
"Internet Connectivity": "Enabled",
"IP Address Type": "Public IPv4 Address Available",
"Connection Capability": [{"status": "open", "protocol": "TCP", "port": 8888}],
"ANQP Domain ID": 1234,
"GAS Address 3 Behaviour": "P2P Spec Workaround From Request",
"Disable DGAF": False
}
}
EOF EOF
DYN_CONFIG="$(python .quali/get_configuration.py --json ${{ steps.reservation.outputs.identifier }})"
jq ".CONFIGURATION.basic=$DYN_CONFIG" lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
- name: run tests - name: run tests
uses: ./.github/actions/run-tests uses: ./.github/actions/run-tests
with: with:
namespace: ${{ steps.namespace.outputs.name }} namespace: ${{ steps.namespace.outputs.name }}
testbed: advanced testbed: advanced
marker_expression: "${{ needs.vars.outputs.marker_expression }}" marker_expression: "${{ needs.vars.outputs.marker_expression }}"
configuration_file: "./configuration.py" configuration_file: "./lab_info.json"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"' additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
allure_results_artifact_name: allure-results-${{ matrix.ap_model }} allure_results_artifact_name: allure-results-${{ matrix.ap_model }}

107
.github/workflows/quali-basic-manual.yml vendored
View File

@@ -124,115 +124,20 @@ jobs:
CLOUDSHELL_USER: ${{ secrets.CLOUDSHELL_USER }} CLOUDSHELL_USER: ${{ secrets.CLOUDSHELL_USER }}
CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }} CLOUDSHELL_PASSWORD: ${{ secrets.CLOUDSHELL_PASSWORD }}
run: | run: |
cat << EOF > configuration.py cat << EOF > lab_info.json
Customer = "" ${{ secrets.LAB_CONFIGURATION_JSON }}
server = ""
CONFIGURATION = {
"basic": $(python .quali/get_configuration.py ${{ steps.reservation.outputs.identifier }})
}
open_flow = {}
RADIUS_SERVER_DATA = {
"ip": "10.10.1.221",
"port": 1812,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
RADIUS_ACCOUNTING_DATA = {
"ip": "10.10.1.221",
"port": 1813,
"secret": "testing123",
"user": "user",
"password": "password",
"pk_password": "whatever"
}
PASSPOINT_RADIUS_SERVER_DATA = {
"ip": "52.234.179.191",
"port": 11812,
"secret": "yeababy20!",
"user": "nolaradius",
"password": "nolastart",
"pk_password": "whatever"
}
PASSPOINT_RADIUS_ACCOUNTING_SERVER_DATA = {
"ip": "52.234.179.191",
"port": 11813,
"secret": "yeababy20!"
}
PASSPOINT_PROVIDER_INFO = {
"mcc": None,
"mnc": None,
"network": None,
"nai_realms": {
"domain": "oss.ameriband.com",
"encoding": 0,
"eap_map": {"EAP-TTLS with username/password": ["Credential Type:username/password",
"Non-EAP Inner Authentication Type:MSCHAPV2"]}
},
"osu_nai_standalone": "anonymous@ameriband.com",
"osu_nai_shared": "anonymous@ameriband.com",
"roaming_oi": []
}
PASSPOINT_OPERATOR_INFO = {
"osen": "Disabled",
"domain_name_list": ["telecominfraproject.atlassian.net"],
"operator_names": [
{"locale": "eng", "name": "Default friendly passpoint_operator name"},
{"locale": "fra", "name": "Nom de l'opérateur convivial par défaut"}
]
}
PASSPOINT_VENUE_INFO = {
"venue_type": {"group": "Business", "type": "Police Station"},
"venue_names": [
{"locale": "eng", "name": "Example passpoint_venue", "url": "http://www.example.com/info-eng"},
{"locale": "fra", "name": "Exemple de lieu", "url": "http://www.example.com/info-fra"}
]
}
PASSPOINT_PROFILE_INFO = {
"profile_download_url_ios": "https://onboard.almondlabs.net/ttls/AmeriBand-Profile.mobileconfig",
"profile_download_url_android": "https://onboard.almondlabs.net/ttls/androidconfig.cfg",
"profile_name_on_device": "AmeriBand",
"radius_configuration": {
"user_defined_nas_id": "FB001AP001",
"operator_id": "AmeribandTIP",
"radius_acounting_service_interval": 60
},
"interworking_hs2dot0": "Enabled",
"hessid": None,
"access_network": {
"Access Network Type": "Free Public Network",
"Authentication Type": "Acceptance of Terms & Conditions",
"Emergency Services Reachable": "Enabled",
"Unauthenticated Emergency Service": "Disabled",
},
"ip_connectivity": {
"Internet Connectivity": "Enabled",
"IP Address Type": "Public IPv4 Address Available",
"Connection Capability": [{"status": "open", "protocol": "TCP", "port": 8888}],
"ANQP Domain ID": 1234,
"GAS Address 3 Behaviour": "P2P Spec Workaround From Request",
"Disable DGAF": False
}
}
EOF EOF
DYN_CONFIG="$(python .quali/get_configuration.py --json ${{ steps.reservation.outputs.identifier }})"
jq ".CONFIGURATION.basic=$DYN_CONFIG" lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
- name: run tests - name: run tests
uses: ./.github/actions/run-tests uses: ./.github/actions/run-tests
with: with:
namespace: ${{ steps.namespace.outputs.name }} namespace: ${{ steps.namespace.outputs.name }}
testbed: basic testbed: basic
marker_expression: ${{ github.event.inputs.marker_expression }} marker_expression: ${{ github.event.inputs.marker_expression }}
configuration_file: "./configuration.py" configuration_file: "./lab_info.json"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: '-o firmware="${{ github.event.inputs.firmware }}"' additional_args: '-o firmware="${{ github.event.inputs.firmware }}"'
allure_results_artifact_name: allure-results allure_results_artifact_name: allure-results

144
.github/workflows/quali.yml vendored
View File

@@ -138,147 +138,17 @@ jobs:
- name: prepare configuration - name: prepare configuration
run: | run: |
cat << EOF > configuration.py cat << EOF > lab_info.json
Customer = '' ${{ secrets.LAB_CONFIGURATION_JSON }}
server = ''
CONFIGURATION = {
'basic': $(python .quali/get_configuration.py ${{ steps.reservation.outputs.identifier }})
}
open_flow = {}
RADIUS_SERVER_DATA = {
'ip': '10.10.1.221',
'port': 1812,
'secret': 'testing123',
'user': 'user',
'password': 'password',
'pk_password': 'whatever'
}
RADIUS_ACCOUNTING_DATA = {
'ip': '10.10.1.221',
'port': 1813,
'secret': 'testing123',
'user': 'user',
'password': 'password',
'pk_password': 'whatever'
}
DYNAMIC_VLAN_RADIUS_SERVER_DATA = {
'ip': '3.20.165.131',
'port': 1812,
'secret': 'testing123',
'user': 'user',
'password': 'password',
'pk_password': 'whatever'
}
DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA = {
'ip': '3.20.165.131',
'port': 1813,
'secret': 'testing123',
'user': 'user',
'password': 'password',
'pk_password': 'whatever'
}
PASSPOINT_RADIUS_SERVER_DATA = {
'ip': '52.234.179.191',
'port': 11812,
'secret': 'yeababy20!',
'user': 'nolaradius',
'password': 'nolastart',
'pk_password': 'whatever'
}
PASSPOINT_RADIUS_ACCOUNTING_SERVER_DATA = {
'ip': '52.234.179.191',
'port': 11813,
'secret': 'yeababy20!'
}
PASSPOINT_PROVIDER_INFO = {
'mcc': None,
'mnc': None,
'network': None,
'nai_realms': {
'domain': 'oss.ameriband.com',
'encoding': 0,
'eap_map': {'EAP-TTLS with username/password': ['Credential Type:username/password',
'Non-EAP Inner Authentication Type:MSCHAPV2']}
},
'osu_nai_standalone': 'anonymous@ameriband.com',
'osu_nai_shared': 'anonymous@ameriband.com',
'roaming_oi': []
}
RATE_LIMITING_RADIUS_SERVER_DATA = {
'ip': '18.189.85.200',
'port': 1812,
'secret': 'testing123',
'user': 'user',
'password': 'password',
'pk_password': 'whatever'
}
RATE_LIMITING_RADIUS_ACCOUNTING_DATA = {
'ip': '18.189.85.200',
'port': 1813,
'secret': 'testing123',
'user': 'user',
'password': 'password',
'pk_password': 'whatever'
}
PASSPOINT_OPERATOR_INFO = {
'osen': 'Disabled',
'domain_name_list': ['telecominfraproject.atlassian.net'],
'operator_names': [
{'locale': 'eng', 'name': 'Default friendly passpoint_operator name'},
{'locale': 'fra', 'name': 'Nom de l\'opérateur convivial par défaut'}
]
}
PASSPOINT_VENUE_INFO = {
'venue_type': {'group': 'Business', 'type': 'Police Station'},
'venue_names': [
{'locale': 'eng', 'name': 'Example passpoint_venue', 'url': 'http://www.example.com/info-eng'},
{'locale': 'fra', 'name': 'Exemple de lieu', 'url': 'http://www.example.com/info-fra'}
]
}
PASSPOINT_PROFILE_INFO = {
'profile_download_url_ios': 'https://onboard.almondlabs.net/ttls/AmeriBand-Profile.mobileconfig',
'profile_download_url_android': 'https://onboard.almondlabs.net/ttls/androidconfig.cfg',
'profile_name_on_device': 'AmeriBand',
'radius_configuration': {
'user_defined_nas_id': 'FB001AP001',
'operator_id': 'AmeribandTIP',
'radius_acounting_service_interval': 60
},
'interworking_hs2dot0': 'Enabled',
'hessid': None,
'access_network': {
'Access Network Type': 'Free Public Network',
'Authentication Type': 'Acceptance of Terms & Conditions',
'Emergency Services Reachable': 'Enabled',
'Unauthenticated Emergency Service': 'Disabled',
},
'ip_connectivity': {
'Internet Connectivity': 'Enabled',
'IP Address Type': 'Public IPv4 Address Available',
'Connection Capability': [{'status': 'open', 'protocol': 'TCP', 'port': 8888}],
'ANQP Domain ID': 1234,
'GAS Address 3 Behaviour': 'P2P Spec Workaround From Request',
'Disable DGAF': False
}
}
EOF EOF
DYN_CONFIG="$(python .quali/get_configuration.py --json ${{ steps.reservation.outputs.identifier }})"
jq ".CONFIGURATION.basic=$DYN_CONFIG" lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
# overwrite configuration value from Quali # overwrite configuration value from Quali
if [ ${{ needs.vars.outputs.existing_controller }} != '' ] if [ ${{ needs.vars.outputs.existing_controller }} != '' ]
then then
sed -i "s/https:\/\/sec-.*\.cicd\.lab\.wlan\.tip\.build/https:\/\/sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build/g" configuration.py jq '.CONFIGURATION.basic.controller.url="https://sec-${{ needs.vars.outputs.existing_controller }}.cicd.lab.wlan.tip.build:16001"' lab_info.json > lab_info.json.tmp && mv lab_info.json.tmp lab_info.json
fi fi
- name: run tests - name: run tests
@@ -287,7 +157,7 @@ jobs:
namespace: ${{ steps.namespace.outputs.name }} namespace: ${{ steps.namespace.outputs.name }}
testbed: basic testbed: basic
marker_expression: "${{ needs.vars.outputs.marker_expression }}" marker_expression: "${{ needs.vars.outputs.marker_expression }}"
configuration_file: "./configuration.py" configuration_file: "./lab_info.json"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"' additional_args: '-o firmware="${{ needs.vars.outputs.ap_version }}"'
allure_results_artifact_name: allure-results-${{ matrix.ap_model }} allure_results_artifact_name: allure-results-${{ matrix.ap_model }}

10
.github/workflows/regression.yml vendored
View File

@@ -88,7 +88,7 @@ jobs:
namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-dfs namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-dfs
testbed: "${{ matrix.testbed }}" testbed: "${{ matrix.testbed }}"
marker_expression: "regression and dfs" marker_expression: "regression and dfs"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.testbed }}-dfs allure_results_artifact_name: allure-results-${{ matrix.testbed }}-dfs
@@ -99,7 +99,7 @@ jobs:
namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-multipsk namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-multipsk
testbed: "${{ matrix.testbed }}" testbed: "${{ matrix.testbed }}"
marker_expression: "regression and multipsk" marker_expression: "regression and multipsk"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.testbed }}-multipsk allure_results_artifact_name: allure-results-${{ matrix.testbed }}-multipsk
@@ -110,7 +110,7 @@ jobs:
namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-rate_limiting namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-rate_limiting
testbed: "${{ matrix.testbed }}" testbed: "${{ matrix.testbed }}"
marker_expression: "regression and rate_limiting" marker_expression: "regression and rate_limiting"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.testbed }}-rate_limiting allure_results_artifact_name: allure-results-${{ matrix.testbed }}-rate_limiting
@@ -121,7 +121,7 @@ jobs:
namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-rate_limiting_with_radius namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-rate_limiting_with_radius
testbed: "${{ matrix.testbed }}" testbed: "${{ matrix.testbed }}"
marker_expression: "regression and rate_limiting_with_radius" marker_expression: "regression and rate_limiting_with_radius"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.testbed }}-rate_limiting_with_radius allure_results_artifact_name: allure-results-${{ matrix.testbed }}-rate_limiting_with_radius
@@ -132,7 +132,7 @@ jobs:
namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-dynamic_vlan namespace: regression-${{ github.run_id }}-${{ matrix.testbed }}-dynamic_vlan
testbed: "${{ matrix.testbed }}" testbed: "${{ matrix.testbed }}"
marker_expression: "regression and dynamic_vlan" marker_expression: "regression and dynamic_vlan"
configuration: "${{ secrets.LAB_CONFIGURATION }}" configuration: "${{ secrets.LAB_CONFIGURATION_JSON }}"
testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }} testing_docker_image: tip-tip-wlan-cloud-docker-repo.jfrog.io/cloud-sdk-nightly:${{ github.run_id }}
allure_results_artifact_name: allure-results-${{ matrix.testbed }}-dynamic_vlan allure_results_artifact_name: allure-results-${{ matrix.testbed }}-dynamic_vlan

11
.quali/get_configuration.py
View File

@@ -1,3 +1,4 @@
import argparse
import json import json
import sys import sys
@@ -18,8 +19,13 @@ def get_attribute_value(cloudshell_session, attribute):
def main(): def main():
argparser = argparse.ArgumentParser()
argparser.add_argument('--json', default=False, help="render configuration as JSON instead of Python dict", action='store_true')
argparser.add_argument('reservation_id')
args = argparser.parse_args()
session = get_session() session = get_session()
res_id = sys.argv[1] res_id = args.reservation_id
reservation_details = session.GetReservationDetails(res_id).ReservationDescription reservation_details = session.GetReservationDetails(res_id).ReservationDescription
resources_in_reservation = reservation_details.Resources resources_in_reservation = reservation_details.Resources
@@ -83,6 +89,9 @@ def main():
else: else:
continue continue
if args.json:
print(json.dumps(config))
else:
print(repr(config)) print(repr(config))