From accf975da90959411699d940b99b3196c73b6d01 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 15:17:09 +0300 Subject: [PATCH 01/11] [WIFI-11619] Add: git commit the changes Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index cfaa3b000..0aae53ad4 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -40,11 +40,18 @@ jobs: with: results_path: ./allure-results - - name: List current dir + - name: Update allure report run: | - echo $PWD - ls - git status + mv allure-report tmp-report + rm -rf allure-* + git checkout gh-pages + mv tmp-report report + ssh-keyscan -H github.com >> ~/.ssh/known_hosts + echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials + git config --global credential.helper store + git config --global user.email "tip-automation@telecominfraproject.com" + git config --global user.name "TIP Automation User" + git commit -a -m'Update allure report for github pages' - name: Publish Allure report to GitHub Pages uses: ad-m/github-push-action@v0.6.0 From 171094f24d608ef6fa73d42d8d1d419b94f8799e Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 15:25:35 +0300 Subject: [PATCH 02/11] [WIFI-11619] Add: git commit the changes Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index 0aae53ad4..ba8384455 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -44,13 +44,14 @@ jobs: run: | mv allure-report tmp-report rm -rf allure-* - git checkout gh-pages - mv tmp-report report ssh-keyscan -H github.com >> ~/.ssh/known_hosts echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials git config --global credential.helper store git config --global user.email "tip-automation@telecominfraproject.com" git config --global user.name "TIP Automation User" + git pull + git checkout gh-pages + mv tmp-report report git commit -a -m'Update allure report for github pages' - name: Publish Allure report to GitHub Pages From 2210ff85f542f7f5c1afb8844e21289d4e8e485c Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 15:32:15 +0300 Subject: [PATCH 03/11] [WIFI-11619] Add: git commit the changes Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index ba8384455..df22b9dfb 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -44,6 +44,7 @@ jobs: run: | mv allure-report tmp-report rm -rf allure-* + mkdir -p ~/.ssh ssh-keyscan -H github.com >> ~/.ssh/known_hosts echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials git config --global credential.helper store From f5730d4854ef19f47d0b5c64bb468b3b63f09936 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 15:39:44 +0300 Subject: [PATCH 04/11] [WIFI-11619] Add: git commit the changes Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index df22b9dfb..13731559b 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -53,7 +53,8 @@ jobs: git pull git checkout gh-pages mv tmp-report report - git commit -a -m'Update allure report for github pages' + git add report + git commit -m'Update allure report for github pages' - name: Publish Allure report to GitHub Pages uses: ad-m/github-push-action@v0.6.0 From 840c0a84bff48142b1d1ed96a6600e4441e88df9 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 15:45:43 +0300 Subject: [PATCH 05/11] [WIFI-11619] Add: git commit the changes Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index 13731559b..929bfe131 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -61,7 +61,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: gh-pages - directory: ./allure-report + directory: ./report cleanup: needs: [build, testsgen] From b9de0e28b40c8863fa5585c4f11b1fcba42ba952 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 15:53:42 +0300 Subject: [PATCH 06/11] [WIFI-11619] Chg: GitHub Pages dir Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index 929bfe131..f5c1801b7 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -42,7 +42,7 @@ jobs: - name: Update allure report run: | - mv allure-report tmp-report + mv allure-report tmp-docs rm -rf allure-* mkdir -p ~/.ssh ssh-keyscan -H github.com >> ~/.ssh/known_hosts @@ -52,8 +52,8 @@ jobs: git config --global user.name "TIP Automation User" git pull git checkout gh-pages - mv tmp-report report - git add report + mv tmp-docs docs + git add docs git commit -m'Update allure report for github pages' - name: Publish Allure report to GitHub Pages @@ -61,7 +61,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: gh-pages - directory: ./report + directory: ./docs cleanup: needs: [build, testsgen] From b3372a6fe329251f77d15dc437a499db5e4a5240 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 16:00:34 +0300 Subject: [PATCH 07/11] [WIFI-11619] Chg: GitHub Pages dir Signed-off-by: Dmitry Dunaev --- .github/workflows/update-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-tests.yml b/.github/workflows/update-tests.yml index f5c1801b7..a1e20ff40 100644 --- a/.github/workflows/update-tests.yml +++ b/.github/workflows/update-tests.yml @@ -51,7 +51,7 @@ jobs: git config --global user.email "tip-automation@telecominfraproject.com" git config --global user.name "TIP Automation User" git pull - git checkout gh-pages + git checkout gh-pages || git checkout -b gh-pages mv tmp-docs docs git add docs git commit -m'Update allure report for github pages' From 32e5da317ff61ec8ef59cc4e059c077258144927 Mon Sep 17 00:00:00 2001 From: haricharan-jaka Date: Thu, 24 Nov 2022 18:30:36 +0530 Subject: [PATCH 08/11] Added extra parameters in rate limiting test to accomodate lanforge testcases in Perfecto Interop Signed-off-by: haricharan-jaka --- libs/perfecto_interop/android_tests.py | 4 +++- libs/perfecto_interop/ios_tests.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/perfecto_interop/android_tests.py b/libs/perfecto_interop/android_tests.py index f2b595ae7..a12211cd8 100644 --- a/libs/perfecto_interop/android_tests.py +++ b/libs/perfecto_interop/android_tests.py @@ -191,7 +191,9 @@ class AndroidTests(android_libs): print(e) self.teardown() - def rate_limiting_test(self, ssid, passkey, up_rate=None, down_rate=None): + def rate_limiting_test(self, ssid, passkey, up_rate, down_rate, instance_name=None, mode=None,download_rate=None, + batch_size=None, upload_rate=None, protocol=None, duration=None, move_to_influx=None, + dut_data=None, num_stations=None): self.setup_perfectoMobile = list(self.setup_perfectoMobile_android(get_device_configuration= self.perfecto_data[self.device], perfecto_data=self.perfecto_data)) diff --git a/libs/perfecto_interop/ios_tests.py b/libs/perfecto_interop/ios_tests.py index 7270f5164..77bbfdf2b 100644 --- a/libs/perfecto_interop/ios_tests.py +++ b/libs/perfecto_interop/ios_tests.py @@ -158,7 +158,9 @@ class ios_tests(ios_libs): self.teardown() return "Fail", "Failed due to exception or Unable to find the API path" - def rate_limiting_test(self, ssid, passkey, up_rate=None, down_rate=None): + def rate_limiting_test(self, ssid, passkey, up_rate, down_rate, instance_name=None, mode=None,download_rate=None, + batch_size=None, upload_rate=None, protocol=None, duration=None, move_to_influx=None, + dut_data=None, num_stations=None): self.setup_perfectoMobile = list(self.setup_perfectoMobile_iOS(get_device_configuration= self.perfecto_data[self.device], perfecto_data=self.perfecto_data)) From 20815b2f1ad0fca949ca6874223a090848b33458 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Thu, 24 Nov 2022 16:11:33 +0300 Subject: [PATCH 09/11] [WIFI-11619] Add: README note Signed-off-by: Dmitry Dunaev --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5e781f4d4..329b34b5e 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ This test automation tied into our overall tooling at TIP as shown below: ![Tools and Test Automation](.img/Tools_and_Testing.png) +You can get the full list of tests on [GitHub Pages](https://telecominfraproject.github.io/wlan-testing/) that's updated automatically. + ### General guidelines This testing code adheres to generic [pep8](https://www.python.org/dev/peps/pep-0008/#introduction) style guidelines, most notably: From 98de2a814ef4f9974013416f2c775e6c09924fa4 Mon Sep 17 00:00:00 2001 From: haricharan-jaka Date: Thu, 24 Nov 2022 18:54:54 +0530 Subject: [PATCH 10/11] Rectified ssid parameter in Perfecto Interop Signed-off-by: haricharan-jaka --- libs/perfecto_interop/android_tests.py | 6 +++--- libs/perfecto_interop/ios_tests.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/perfecto_interop/android_tests.py b/libs/perfecto_interop/android_tests.py index a12211cd8..273ad032b 100644 --- a/libs/perfecto_interop/android_tests.py +++ b/libs/perfecto_interop/android_tests.py @@ -191,20 +191,20 @@ class AndroidTests(android_libs): print(e) self.teardown() - def rate_limiting_test(self, ssid, passkey, up_rate, down_rate, instance_name=None, mode=None,download_rate=None, + def rate_limiting_test(self, ssid_name, passkey, up_rate, down_rate, instance_name=None, mode=None,download_rate=None, batch_size=None, upload_rate=None, protocol=None, duration=None, move_to_influx=None, dut_data=None, num_stations=None): self.setup_perfectoMobile = list(self.setup_perfectoMobile_android(get_device_configuration= self.perfecto_data[self.device], perfecto_data=self.perfecto_data)) setup_perfecto_mobile = self.setup_perfectoMobile[0] - ssid_with_internet, setup, ssid_found = self.wifi_connect(ssid=ssid, passkey=passkey, setup_perfectoMobile= + ssid_with_internet, setup, ssid_found = self.wifi_connect(ssid=ssid_name, passkey=passkey, setup_perfectoMobile= setup_perfecto_mobile, connData=self.connData) try: if ssid_with_internet is not None and ssid_found is True: self.closeApp(self.connData["appPackage-android"], setup) down_speed, up_speed = self.speed_test(setup_perfecto_mobile) - self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData) + self.wifi_disconnect(ssid=ssid_name, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData) self.teardown() if down_speed is not None and up_speed is not None: if float(down_speed) < float(down_rate) and float(up_speed) < float(up_rate): diff --git a/libs/perfecto_interop/ios_tests.py b/libs/perfecto_interop/ios_tests.py index 77bbfdf2b..1e52ec214 100644 --- a/libs/perfecto_interop/ios_tests.py +++ b/libs/perfecto_interop/ios_tests.py @@ -158,20 +158,20 @@ class ios_tests(ios_libs): self.teardown() return "Fail", "Failed due to exception or Unable to find the API path" - def rate_limiting_test(self, ssid, passkey, up_rate, down_rate, instance_name=None, mode=None,download_rate=None, + def rate_limiting_test(self, ssid_name, passkey, up_rate, down_rate, instance_name=None, mode=None,download_rate=None, batch_size=None, upload_rate=None, protocol=None, duration=None, move_to_influx=None, dut_data=None, num_stations=None): self.setup_perfectoMobile = list(self.setup_perfectoMobile_iOS(get_device_configuration= self.perfecto_data[self.device], perfecto_data=self.perfecto_data)) setup_perfecto_mobile = self.setup_perfectoMobile[0] - ssid_with_internet, setup, ssid_found = self.wifi_connect(ssid=ssid, passkey=passkey, setup_perfectoMobile= + ssid_with_internet, setup, ssid_found = self.wifi_connect(ssid=ssid_name, passkey=passkey, setup_perfectoMobile= setup_perfecto_mobile, connData=self.connData) try: if ssid_with_internet is not None and ssid_found is True: self.closeApp(self.connData["bundleId-iOS-Settings"], setup) down_speed, up_speed = self.speed_test(setup_perfecto_mobile) - self.wifi_disconnect(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData) + self.wifi_disconnect(ssid=ssid_name, setup_perfectoMobile=setup_perfecto_mobile, connData=self.connData) self.teardown() if down_speed is not None and up_speed is not None: if float(down_speed) < float(down_rate) and float(up_speed) < float(up_rate): From ea0f76aee67c40d658a1f53ed3fe32daac248e62 Mon Sep 17 00:00:00 2001 From: haricharan-jaka Date: Thu, 24 Nov 2022 19:16:35 +0530 Subject: [PATCH 11/11] Changed ssid to ssid_name in Interop rate limiting testcases Signed-off-by: haricharan-jaka --- .../bridge_mode/rate_limiting/test_rate_limiting.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py index 233a4cb34..9226a44a0 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/test_rate_limiting.py @@ -117,7 +117,7 @@ class TestRateLimitingBridge(object): mode = "BRIDGE" band = "twog" - passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + passes, result = get_test_library.rate_limiting_test(ssid_name=ssid_name, passkey=security_key, up_rate=up_rate, down_rate=down_rate) assert passes == "PASS", result @@ -141,7 +141,7 @@ class TestRateLimitingBridge(object): mode = "BRIDGE" band = "fiveg" - passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + passes, result = get_test_library.rate_limiting_test(ssid_name=ssid_name, passkey=security_key, up_rate=up_rate, down_rate=down_rate) assert passes == "PASS", result @@ -166,7 +166,7 @@ class TestRateLimitingBridge(object): mode = "BRIDGE" band = "twog" - passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + passes, result = get_test_library.rate_limiting_test(ssid_name=ssid_name, passkey=security_key, up_rate=up_rate, down_rate=down_rate) assert passes == "PASS", result @@ -191,7 +191,7 @@ class TestRateLimitingBridge(object): mode = "BRIDGE" band = "fiveg" - passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + passes, result = get_test_library.rate_limiting_test(ssid_name=ssid_name, passkey=security_key, up_rate=up_rate, down_rate=down_rate) assert passes == "PASS", result @@ -215,7 +215,7 @@ class TestRateLimitingBridge(object): mode = "BRIDGE" band = "twog" - passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + passes, result = get_test_library.rate_limiting_test(ssid_name=ssid_name, passkey=security_key, up_rate=up_rate, down_rate=down_rate) assert passes == "PASS", result @@ -239,7 +239,7 @@ class TestRateLimitingBridge(object): mode = "BRIDGE" band = "fiveg" - passes, result = get_test_library.rate_limiting_test(ssid=ssid_name, passkey=security_key, up_rate=up_rate, + passes, result = get_test_library.rate_limiting_test(ssid_name=ssid_name, passkey=security_key, up_rate=up_rate, down_rate=down_rate) assert passes == "PASS", result