From 2197f2e824e920da02032d2f1425f81189ab8a15 Mon Sep 17 00:00:00 2001 From: raj-TIP Date: Fri, 30 Apr 2021 10:45:19 -0500 Subject: [PATCH] Updated pytest android Signed-off-by: raj-TIP --- tests/configuration.py | 104 +++--------------- .../test_AccessPointConnection.py | 9 +- .../iOS/WifiMode/test_ToggleWifiMode.py | 9 +- 3 files changed, 19 insertions(+), 103 deletions(-) diff --git a/tests/configuration.py b/tests/configuration.py index f962c892e..7283f61af 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -1,9 +1,8 @@ - CONFIGURATION = { - "ext-03": { + "interop": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller + 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller 'username': 'support@example.com', 'password': 'support', 'version': '1.0.0-SNAPSHOT', @@ -12,100 +11,22 @@ CONFIGURATION = { 'access_point': [ { 'model': 'ecw5410', - 'serial': '903cb3944857', + 'mode': 'wifi5', + 'serial': '68215fd2f78c', 'jumphost': True, - 'ip': "192.168.200.80", + 'ip': "localhost", 'username': "lanforge", - 'password': "lanforge", - 'port': 22, + 'password': "pumpkin77", + 'port': 8803, 'jumphost_tty': '/dev/ttyAP1', - 'version': "version" + 'version': "ecw5410-2021-04-26-pending-3fc41fa" } ], "traffic_generator": { - "name": "lanforge", + "name": "Perfecto", "details": { - "ip": "localhost", - "port": 8080, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy1"], - "AX-Radio": ["wiphy2"], - "upstream": "eth1", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan1", - "AX-Station-Name": "ax", - } - } - }, - "ext-04": { - "controller": { - 'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': '1.0.0-SNAPSHOT', - 'commit_date': '2021-03-01' - }, - 'access_point': [ - { - 'model': 'ecw5410', - 'serial': '903cb394486f', - 'jumphost': True, - 'ip': "192.168.200.81", - 'username': "lanforge", - 'password': "lanforge", - 'port': 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "version" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "192.168.200.81", - "port": 8080, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy1"], - "AX-Radio": ["wiphy2"], - "upstream": "eth1", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan1", - "AX-Station-Name": "ax", - } - } - }, - "ext-05": { - "controller": { - 'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': '1.0.0-SNAPSHOT', - 'commit_date': '2021-03-01' - }, - 'access_point': [ - { - 'model': 'ecw5410', - 'serial': '903cb3944817', - 'jumphost': True, - 'ip': "192.168.200.82", - 'username': "lanforge", - 'password': "lanforge", - 'port': 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "version" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "192.168.200.82", - "port": 8080, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy1"], - "AX-Radio": ["wiphy2"], - "upstream": "eth1", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan1", - "AX-Station-Name": "ax", + "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw", + "perfectoURL": "tip" } } } @@ -191,4 +112,5 @@ TEST_CASES = { "bridge_ssid_update": 8742, "nat_ssid_update": 8743, "vlan_ssid_update": 8744 -} \ No newline at end of file +} + diff --git a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py b/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py index 535fa16b3..54367d280 100644 --- a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py +++ b/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py @@ -33,13 +33,10 @@ class TestPassPointConnectivetyIOS(object): def test_AccessPointConnection(self, setup_profile_data, get_AccessPointConn_data, setup_perfectoMobile_iOS): - profile_data = setup_profile_data["NAT"]["WPA"]["5G"] + profile_data = setup_profile_data["NAT"]["WPA"]["5G"] + #profile_data = setup_profile_data["NAT"]["WPA"]["2G"] ssidName = profile_data["ssid_name"] - security_key = profile_data["security_key"] - - profile_data = setup_profile_data["NAT"]["WPA"]["2G"] - ssidPassword = profile_data["ssid_name"] - security_key = profile_data["security_key"] + ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword) diff --git a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py b/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py index 1a09c7a6c..4aac82775 100644 --- a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py +++ b/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py @@ -33,13 +33,10 @@ class TestToggleWifiMode(object): def test_ToogleWifiMode(self, setup_profile_data, get_ToggleWifiMode_data, setup_perfectoMobile_iOS): - profile_data = setup_profile_data["NAT"]["WPA"]["5G"] + profile_data = setup_profile_data["NAT"]["WPA"]["5G"] + #profile_data = setup_profile_data["NAT"]["WPA"]["2G"] ssidName = profile_data["ssid_name"] - security_key = profile_data["security_key"] - - profile_data = setup_profile_data["NAT"]["WPA"]["2G"] - ssidPassword = profile_data["ssid_name"] - security_key = profile_data["security_key"] + ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) print ("SSID_PASS: " + ssidPassword)