diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py index f03e9e897..5db28ff61 100644 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -158,7 +158,7 @@ class ChamberView: def Chamber_View(self): if self.delete_old_scenario: - self.CreateChamberview.clean_cv_scenario(type="Network-Connectivity", scenario_name=self.scenario_name) + self.CreateChamberview.clean_cv_scenario(cv_type="Network-Connectivity", scenario_name=self.scenario_name) self.CreateChamberview.setup(create_scenario=self.scenario_name, raw_line=self.raw_line ) diff --git a/libs/perfecto_libs/android_lib.py b/libs/perfecto_libs/android_lib.py index 81c138909..56d318b3a 100644 --- a/libs/perfecto_libs/android_lib.py +++ b/libs/perfecto_libs/android_lib.py @@ -60,9 +60,9 @@ def scrollDown(setup_perfectoMobile): params2["start"] = "50%,90%" params2["end"] = "50%,20%" params2["duration"] = "4" - time.sleep(2) + # time.sleep(2) setup_perfectoMobile[0].execute_script('mobile:touch:swipe', params2) - time.sleep(1) + time.sleep(3) def getDeviceID(setup_perfectoMobile): @@ -1195,7 +1195,7 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa print("No Connected SSIDS") #----------------------This is to Forget current connected SSID-------------------------------- - time.sleep(2) + # time.sleep(2) print("Selecting Wifi: " + WifiName) #allure.attach(name= body=str("Selecting Wifi: " + WifiName)) ssid_found = False @@ -1203,7 +1203,7 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa #This is To get all available ssids #------------------------------------------------------ try: - for k in range(3): + for k in range(9): available_ssids = get_all_available_ssids(driver) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -1785,8 +1785,8 @@ def wifi_disconnect_and_forget(request, WifiName, WifiPass, setup_perfectoMobile def get_all_available_ssids(driver): active_ssid_list = [] try: - time.sleep(5) - driver.implicitly_wait(5) + time.sleep(2) + driver.implicitly_wait(1) elements = driver.find_elements_by_xpath("//*[@resource-id='com.android.settings:id/title']") # print("elements: ", elements) print(len(elements)) @@ -2191,7 +2191,7 @@ def get_ip_address_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoM #This is To get all available ssids #------------------------------------------------------ try: - for k in range(3): + for k in range(10): available_ssids = get_all_available_ssids(driver) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) diff --git a/libs/perfecto_libs/iOS_lib.py b/libs/perfecto_libs/iOS_lib.py index d324486db..f9e9cde05 100644 --- a/libs/perfecto_libs/iOS_lib.py +++ b/libs/perfecto_libs/iOS_lib.py @@ -38,9 +38,9 @@ def scrollDown(setup_perfectoMobile): params2["start"] = "50%,90%" params2["end"] = "50%,20%" params2["duration"] = "4" - time.sleep(5) + # time.sleep(2) setup_perfectoMobile[0].execute_script('mobile:touch:swipe', params2) - time.sleep(5) + time.sleep(3) def closeApp(appName, setup_perfectoMobile): @@ -1015,7 +1015,7 @@ def get_ip_address_ios(request, WifiName, WifiPass, setup_perfectoMobile, connDa available_ssids = False try: - for check_for_all_ssids in range(2): + for check_for_all_ssids in range(9): available_ssids = get_all_available_ssids(driver) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) try: @@ -1177,8 +1177,8 @@ def get_all_available_ssids(driver): active_ssid_list = [] try: - time.sleep(8) - driver.implicitly_wait(10) + time.sleep(2) + driver.implicitly_wait(2) elements = driver.find_elements_by_xpath("(//*[@label='More Info']/parent::*/XCUIElementTypeStaticText)") print(len(elements)) for i in range(len(elements)): @@ -1730,7 +1730,7 @@ def get_ip_address_eap_ios(request, WifiName, User, ttls_passwd, setup_perfectoM available_ssids = False try: - for check_for_all_ssids in range(2): + for check_for_all_ssids in range(9): available_ssids = get_all_available_ssids(driver) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) try: diff --git a/tests/configuration.py b/tests/configuration.py index 9ae8f83ef..b87e47e1c 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -18,15 +18,16 @@ ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \ ubuntu@3.130.51.163 +Run the below command to open tunnel to all labs: -ssh -C -L 8700:lf1:4002 -L 8701:lf1:5901 -L 8702:lf1:8080 -L 8703:lab-ctlr:22 -L 8704:lf1:22\ - -L 8710:lf2:4002 -L 8711:lf2:5901 -L 8712:lf2:8080 -L 8713:lab-ctlr:22 -L 8714:lf2:22\ - -L 8720:lf3:4002 -L 8721:lf3:5901 -L 8722:lf3:8080 -L 8723:lab-ctlr:22 -L 8724:lf3:22\ - -L 8730:lf4:4002 -L 8731:lf4:5901 -L 8732:lf4:8080 -L 8733:lab-ctlr:22 -L 8734:lf4:22\ - -L 8740:lf12:4002 -L 8741:lf12:5901 -L 8742:lf12:8080 -L 8743:lab-ctlr4:22 -L 8744:lf12:22\ - -L 8750:lf13:4002 -L 8751:lf13:5901 -L 8752:lf13:8080 -L 8753:lab-ctlr4:22 -L 8754:lf13:22\ - -L 8760:lf14:4002 -L 8761:lf14:5901 -L 8762:lf14:8080 -L 8763:lab-ctlr4:22 -L 8764:lf14:22\ - -L 8770:lf15:4002 -L 8771:lf15:5901 -L 8772:lf15:8080 -L 8773:lab-ctlr4:22 -L 8774:lf15:22\ +ssh -C -L 8700:lf1:4002 -L 8701:lf1:5901 -L 8702:lf1:8080 -L 8703:lab-ctlr:22 -L 8704:lf1:22 -L 3389:lf1:3389\ + -L 8710:lf2:4002 -L 8711:lf2:5901 -L 8712:lf2:8080 -L 8713:lab-ctlr:22 -L 8714:lf2:22 -L 3390:lf2:3389\ + -L 8720:lf3:4002 -L 8721:lf3:5901 -L 8722:lf3:8080 -L 8723:lab-ctlr:22 -L 8724:lf3:22 -L 3391:lf3:3389\ + -L 8730:lf4:4002 -L 8731:lf4:5901 -L 8732:lf4:8080 -L 8733:lab-ctlr:22 -L 8734:lf4:22 -L 3392:lf4:3389\ + -L 8740:lf12:4002 -L 8741:lf12:5901 -L 8742:lf12:8080 -L 8743:lab-ctlr4:22 -L 8744:lf12:22 -L 3393:lf12:3389\ + -L 8750:lf13:4002 -L 8751:lf13:5901 -L 8752:lf13:8080 -L 8753:lab-ctlr4:22 -L 8754:lf13:22 -L 3394:lf13:3389\ + -L 8760:lf14:4002 -L 8761:lf14:5901 -L 8762:lf14:8080 -L 8763:lab-ctlr4:22 -L 8764:lf14:22 -L 3395:lf14:3389\ + -L 8770:lf15:4002 -L 8771:lf15:5901 -L 8772:lf15:8080 -L 8773:lab-ctlr4:22 -L 8774:lf15:22 -L 3396:lf15:3389\ ubuntu@3.130.51.163 """ @@ -36,32 +37,30 @@ server = "" CONFIGURATION = { "basic-01": { "controller": { - 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': '1.1.0-SNAPSHOT', - 'commit_date': "2021-06-01" + 'url': 'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller + 'username': "tip@ucentral.com", + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'ecw5410', + 'model': 'edgecore_ecw5410', 'mode': 'wifi5', 'serial': '3c2c99f44e77', 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8703, 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.2.0-rc2.tar.gz" + 'version': "next-latest" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.6", - "port": 8080, - "ssh_port": 22, + "ip": "localhost", + "port": 8702, + "ssh_port": 8704, "2.4G-Radio": ["1.1.wiphy4"], "5G-Radio": ["1.1.wiphy5"], "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], @@ -73,35 +72,33 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked deployed + }, # checked deployed 1.x "basic-02": { "controller": { - 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': "1.1.0-SNAPSHOT", - 'commit_date': "2021-06-01" + 'url': 'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller + 'username': "tip@ucentral.com", + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'eap101', + 'model': 'hfcl_ion4', 'mode': 'wifi6', - 'serial': '34efb6af48db', + 'serial': '0006aee53b84', 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8713, 'jumphost_tty': '/dev/ttyAP2', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/trunk/eap101-1.2.0-rc2.tar.gz" + 'version': "next-latest" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.8", - "port": 8080, - "ssh_port": 22, + "ip": "localhost", + "port": 8712, + "ssh_port": 8714, "2.4G-Radio": ["1.1.wiphy4"], "5G-Radio": ["1.1.wiphy5"], "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], @@ -113,16 +110,16 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked deployed + }, # checked deployed 1.x "basic-03": { "controller": { 'url': 'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller 'username': "tip@ucentral.com", - 'password': 'openwifi', + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'ec420', + 'model': 'tp-link_ec420-g1', 'mode': 'wifi5', 'serial': '001122090801', 'jumphost': True, @@ -151,16 +148,55 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, - "basic-04": { + }, # checked 2.x + "basic-03a": { "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', + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'ecw5211', + 'model': 'indio_um-305ac', + 'mode': 'wifi5', + 'serial': '706dec0a8a79', + 'jumphost': True, + 'ip': "localhost", + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 8723, + 'jumphost_tty': '/dev/ttyAP6', + 'version': "release-latest" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "localhost", + "port": 8722, + "ssh_port": 8724, + "2.4G-Radio": ["1.1.wiphy4"], + "5G-Radio": ["1.1.wiphy5"], + "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], + "upstream": "1.1.eth2", + "upstream_subnet": "10.28.2.1/24", + "uplink": "1.1.eth3", + "2.4G-Station-Name": "sta00", + "5G-Station-Name": "sta10", + "AX-Station-Name": "ax" + } + } + }, # checked 2.x + + "basic-04": { + "controller": { + 'url': 'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller + 'username': "tip@ucentral.com", + 'password': 'OpenWifi%123', + }, + 'access_point': [ + { + 'model': 'edgecore_ecw5211', 'mode': 'wifi5', 'serial': '68215fda456d', 'jumphost': True, @@ -169,7 +205,7 @@ CONFIGURATION = { 'password': "pumpkin77", 'port': 8733, 'jumphost_tty': "/dev/ttyAP5", - 'version': "release-latest" + 'version': "next-latest" } ], "traffic_generator": { @@ -179,7 +215,7 @@ CONFIGURATION = { "port": 8732, "ssh_port": 8734, "2.4G-Radio": ["1.1.wiphy4"], - "5G-Radio": [ "1.1.wiphy5"], + "5G-Radio": ["1.1.wiphy5"], "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], "upstream": "1.1.eth2", "upstream_subnet": "10.28.2.1/24", @@ -189,33 +225,33 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked uci + }, # checked 2.x "basic-05": { "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', + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'cig_wf188', + 'model': 'cig_wf188n', 'mode': 'wifi6', 'serial': '0000c1018812', 'jumphost': True, 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 8803, + 'port': 8743, 'jumphost_tty': '/dev/ttyAP1', - 'version': "release-latest" + 'version': "next-latest" } ], "traffic_generator": { "name": "lanforge", "details": { "ip": "localhost", - "port": 8802, - "ssh_port": 8804, + "port": 8742, + "ssh_port": 8744, "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"], "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"], "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], @@ -227,33 +263,33 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked uci + }, # checked 2.x "basic-06": { "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', + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'eap102', + 'model': 'edgecore_eap102', 'mode': 'wifi6', 'serial': '903cb39d6918', 'jumphost': True, - 'ip': "10.28.3.103", # 10.28.3.103 + 'ip': "localhost", # 10.28.3.103 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, # 22 + 'port': 8753, # 22 'jumphost_tty': '/dev/ttyAP2', - 'version': "latest" + 'version': "next-latest" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.30", # 10.28.3.30 - "port": 8080, # 8080 - "ssh_port": 22, + "ip": "localhost", # 10.28.3.30 + "port": 8752, # 8080 + "ssh_port": 8754, "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"], "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"], "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], @@ -265,37 +301,36 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, + }, # checked 2.x "basic-07": { "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', + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'eap101', + 'model': 'edgecore_eap101', 'mode': 'wifi6', 'serial': '903cb36ae223', 'jumphost': True, - 'ip': "10.28.3.103", # 10.28.3.103 + 'ip': "localhost", # 10.28.3.103 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, # 22 + 'port': 8763, # 22 'jumphost_tty': '/dev/ttyAP3', - 'version': "latest-next", - 'version_branch': "https://ucentral-ap-firmware.s3.amazonaws.com/20210908-cig_wf188-v2.1.0-rc3-bcd07e4-upgrade.bin" + 'version': "next-latest" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.32", # 10.28.3.32 - "port": 8080, # 8080 - "ssh_port": 22, - "2.4G-Radio": ["wiphy4"], - "5G-Radio": ["wiphy5"], - "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], + "ip": "localhost", # 10.28.3.32 + "port": 8762, # 8080 + "ssh_port": 8764, + "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"], + "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"], + "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], "upstream": "1.1.eth2", "upstream_subnet": "10.28.2.1/24", "uplink": "1.1.eth3", @@ -304,33 +339,33 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked uci + }, # checked 2.x "basic-08": { "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', + 'password': 'OpenWifi%123', }, 'access_point': [ { - 'model': 'wf194c', + 'model': 'cig_wf194c', 'mode': 'wifi6', 'serial': '089b4bb2f10c', 'jumphost': True, - 'ip': "10.28.3.103", # 10.28.3.103 + 'ip': "localhost", # 10.28.3.103 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, # 22 + 'port': 8773, # 22 'jumphost_tty': '/dev/ttyAP5', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/cig_wf194c/20210729-cig_wf194c-v2.0.0-rc2-02244b8-upgrade.bin" + 'version': "next-650adaf" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.34", # 10.28.3.34 - "port": 8080, # 8080 - "ssh_port": 22, + "ip": "localhost", # 10.28.3.34 + "port": 8772, # 8080 + "ssh_port": 8774, "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"], "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"], "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], @@ -342,172 +377,46 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked - "advanced-01": { - "controller": { - 'url':'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller - 'username': "tip@ucentral.com", - 'password': 'openwifi', - }, - 'access_point': [ - { - 'model': 'eap102', - 'mode': 'wifi6', - 'serial': '903cb3bd7335', - 'jumphost': True, - 'ip': "10.28.3.102", # 10.28.3.103 - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 22, # 22 - 'jumphost_tty': '/dev/ttyAP3', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/cig_wf194c/20210729-cig_wf194c-v2.0.0-rc2-02244b8-upgrade.bin" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "10.28.3.24", - "port": 8080, # 8080 - "ssh_port": 22, - "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2","1.1.wiphy4"], - "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3", "1.1.wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "10.28.2.1/24", - "uplink": "1.1.eth3", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan0", - "AX-Station-Name": "ax" - } - } - - }, - "advanced-02": { - "controller": { - 'url':'https://sec-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller - 'username': "tip@ucentral.com", - 'password': 'openwifi', - }, - 'access_point': [ - { - 'model': 'eap102', - 'mode': 'wifi6', - 'serial': '903cb39d6958', - 'jumphost': True, - 'ip': "10.28.3.102", # 10.28.3.102 - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 8803, # 22 - 'jumphost_tty': '/dev/ttyAP3', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/cig_wf194c/20210729-cig_wf194c-v2.0.0-rc2-02244b8-upgrade.bin" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "10.28.3.26", # 10.28.3.26 - "port": 8802, # 8080 - "ssh_port": 8804, - "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2","1.1.wiphy4"], - "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3", "1.1.wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "10.28.2.1/24", - "uplink": "1.1.eth3", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan0", - "AX-Station-Name": "ax" - } - } - - }, + }, # checked 2.x "mesh": { "controller": { - 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller - 'username': "tip@ucentral.com", - 'password': 'openwifi', + 'url': "http://wlan-portal-svc-digicert.cicd.lab.wlan.tip.build", # API base url for the controller + 'username': 'support@example.com', + 'password': 'support', + 'version': '1.1.0-SNAPSHOT', + 'commit_date': "2021-06-01" }, 'access_point': [ { - 'type' : 'root', 'model': 'eap101', 'mode': 'wifi6', 'serial': '34efb6af4a7a', 'jumphost': True, - 'ip': "localhost", # 10\.28\.3\.101 + 'ip': "10.28.3.101", # 10.28.3.103 'username': "lanforge", 'password': "pumpkin77", - 'port': 8803, # 22 + 'port': 22, # 22 'jumphost_tty': '/dev/ttyAP2', - 'version': "latest" - }, - { - 'type': 'node-1', - 'model': 'eap101', - 'mode': 'wifi6', - 'serial': '34efb6af4903', - 'jumphost': True, - 'ip': "localhost", #10\.28\.3\.101 - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 8803, # 22 - 'jumphost_tty': '/dev/ttyAP3', - 'version': "latest" - }, - { - 'type': 'node-2', - 'model': 'eap102', - 'mode': 'wifi6', - 'serial': '903cb39d692c', - 'jumphost': True, - 'ip': "localhost", # 10\.28\.3\.101 - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 8803, # 22 - 'jumphost_tty': '/dev/ttyAP4', - 'version': "latest" + 'version': "next-650adaf" } ], "traffic_generator": { - "name": "lanforge-mesh", + "name": "lanforge", "details": { - "type": "mesh", - "ip": "localhost", # 10.28.3.14 - "port": 8802, # 8080 - "ssh_port": 8804, - "2.4G-Radio-mobile-sta": ["1.1.wiphy0", "1.1.wiphy2"], - "5G-Radio-mobile-sta": ["1.1.wiphy1", "1.1.wiphy3"], - "AX-Radio-mobile-sta": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], - "upstream-mobile-sta": "1.1.eth2", - "upstream_subnet-mobile-sta": "10.28.2.1/24", - "uplink-mobile-sta": "1.1.eth3", - "2.4G-Radio-root": ["1.2.wiphy0"], - "5G-Radio-root": ["1.2.wiphy1"], - "AX-Radio-root": [], - "upstream-root": "1.2.eth2", - "upstream_subnet-root": "10.28.2.1/24", - "uplink-root": "1.2.eth3", - "2.4G-Radio-node-1": ["1.3.wiphy0"], - "5G-Radio-node-1": ["1.3.wiphy1"], - "AX-Radio-node-1": [], - "upstream-node-1": "1.3.eth2", - "upstream_subnet-node-1": "10.28.2.1/24", - "uplink--node-1": "1.3.eth3", - "2.4G-Radio-node-2": ["1.4.wiphy0"], - "5G-Radio-node-2": ["1.4.wiphy1"], - "AX-Radio-node-2": [], - "upstream-node-2": "1.4.eth2", - "upstream_subnet-node-2": "10.28.2.1/24", - "uplink--node-2": "1.4.eth3", + "ip": "10.28.3.14", # 10.28.3.34 + "port": 8080, # 8080 + "ssh_port": 22, + "2.4G-Radio": ["wiphy0", "wiphy2"], + "5G-Radio": ["wiphy1", "wiphy3"], + "AX-Radio": ["wiphy4", "wiphy5", "wiphy6", "wiphy7"], + "upstream": "1.1.eth2", + "upstream_subnet": "10.28.2.1/24", + "uplink": "1.1.eth3", "2.4G-Station-Name": "wlan0", "5G-Station-Name": "wlan0", "AX-Station-Name": "ax" - }, - + } } - - - }, # checked "interop-01": { "controller": { @@ -528,48 +437,7 @@ CONFIGURATION = { 'password': "pumpkin77", 'port': 22, 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/ecw5410-2021-07-28-pending-0ec23e8.tar.gz" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "10.28.3.22", - "port": 8080, # 8080 - "ssh_port": 22, - "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"], - "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"], - "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], - "upstream": "1.1.eth1", - "upstream_subnet": "10.28.2.1/24", - "uplink": "1.1.eth3", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan1", - "AX-Station-Name": "ax", - "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw", - "perfectoURL": "tip" - } - } - }, - - "interop-02": { - "controller": { - 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller - 'username': "tip@ucentral.com", - 'password': 'openwifi', - }, - 'access_point': [ - { - 'model': 'eap101', - 'mode': 'wifi5', - 'serial': '903cb36ae4a3', - 'jumphost': True, - 'ip': "10.28.3.102", - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 22, - 'jumphost_tty': '/dev/ttyAP4', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap101/20210729-edgecore_eap101-v2.0.0-rc2-02244b8-upgrade.bin" + 'version': "next-650adaf" } ], "traffic_generator": { @@ -592,12 +460,51 @@ CONFIGURATION = { } } }, - "interop-03": { "controller": { 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller 'username': "tip@ucentral.com", - 'password': 'openwifi', + 'password': 'OpenWifi%123', + }, + 'access_point': [ + { + 'model': 'eap101', + 'mode': 'wifi5', + 'serial': '903cb36ae4a3', + 'jumphost': True, + 'ip': "10.28.3.102", + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, + 'jumphost_tty': '/dev/ttyAP4', + 'version': "next-650adaf" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.22", + "port": 8080, # 8080 + "ssh_port": 22, + "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy2"], + "5G-Radio": ["1.1.wiphy1", "1.1.wiphy3"], + "AX-Radio": ["1.1.wiphy4", "1.1.wiphy5", "1.1.wiphy6", "1.1.wiphy7"], + "upstream": "1.1.eth1", + "upstream_subnet": "10.28.2.1/24", + "uplink": "1.1.eth3", + "2.4G-Station-Name": "wlan0", + "5G-Station-Name": "wlan1", + "AX-Station-Name": "ax", + "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw", + "perfectoURL": "tip" + } + } + }, + "interop-02": { + "controller": { + 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller + 'username': "tip@ucentral.com", + 'password': 'OpenWifi%123', }, 'access_point': [ { @@ -610,7 +517,7 @@ CONFIGURATION = { 'password': "pumpkin77", 'port': 22, 'jumphost_tty': '/dev/ttyAP5', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap101/20210729-edgecore_eap101-v2.0.0-rc2-02244b8-upgrade.bin" + 'version': "next-650adaf" } ], "traffic_generator": { @@ -633,25 +540,26 @@ CONFIGURATION = { } } }, - - "ext-01": { + "basic-ext-03-03": { "controller": { - 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller - 'username': "tip@ucentral.com", - 'password': 'openwifi', + 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller + 'username': 'support@example.com', + 'password': 'support', + 'version': "1.1.0-SNAPSHOT", + 'commit_date': "2021-04-27" }, 'access_point': [ { - 'model': 'eap102', - 'mode': 'wifi6', - 'serial': '903cb30bcf12', + 'model': 'ecw5410', + 'mode': 'wifi5', + 'serial': '903cb3944857', 'jumphost': True, 'ip': "192.168.200.80", 'username': "lanforge", 'password': "lanforge", 'port': 22, 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" + 'version': "next-650adaf" } ], "traffic_generator": { @@ -662,7 +570,7 @@ CONFIGURATION = { "ssh_port": 22, "2.4G-Radio": ["wiphy0"], "5G-Radio": ["wiphy1"], - "AX-Radio": [], + "AX-Radio": ["wiphy2"], "upstream": "1.1.eth1", "upstream_subnet": "192.168.200.1/24", "uplink": "1.1.eth2", @@ -674,9 +582,8 @@ CONFIGURATION = { } } - RADIUS_SERVER_DATA = { - "ip": "10.10.10.180", + "ip": "10.10.1.221", "port": 1812, "secret": "testing123", "user": "user", @@ -685,7 +592,7 @@ RADIUS_SERVER_DATA = { } RADIUS_ACCOUNTING_DATA = { - "ip": "10.10.10.180", + "ip": "10.10.1.221", "port": 1813, "secret": "testing123", "user": "user", @@ -785,3 +692,4 @@ PASSPOINT_PROFILE_INFO = { } } +open_flow = {} \ No newline at end of file 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 1b8208039..3ace2a857 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 @@ -36,13 +36,13 @@ class TestDataplaneThroughputBRIDGE(object): pytest -m "dataplane_throughput_test and BRIDGE" """ - @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_ac_station(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + lf_test, station_names_twog, + create_lanforge_chamberview_dut, + get_configuration): """Dataplane THroughput BRIDGE Mode pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and twog" """ @@ -70,13 +70,12 @@ class TestDataplaneThroughputBRIDGE(object): else: assert False - @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3914", name="WIFI-3914") @pytest.mark.wpa2_personal @pytest.mark.fiveg - @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): + 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" """ @@ -105,12 +104,11 @@ class TestDataplaneThroughputBRIDGE(object): 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): + 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" """ @@ -139,12 +137,11 @@ class TestDataplaneThroughputBRIDGE(object): 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): + 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" """ @@ -171,6 +168,3 @@ class TestDataplaneThroughputBRIDGE(object): assert station else: assert False - - - diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index 0244f2e7f..34e04e5c7 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -403,7 +403,7 @@ def setup_perfectoMobile_android(request): driver = webdriver.Remote( 'https://' + request.config.getini("perfectoURL") + '.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) - driver.implicitly_wait(35) + driver.implicitly_wait(2) TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) @@ -507,7 +507,7 @@ def setup_perfectoMobileWeb(request): rdriver = webdriver.Remote( 'https://' + request.config.getini("perfectoURL") + '.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) - rdriver.implicitly_wait(35) + rdriver.implicitly_wait(2) projectname = request.config.getini("projectName") projectversion = request.config.getini("projectVersion") @@ -570,7 +570,7 @@ def setup_perfectoMobile_iOS(request): driver = webdriver.Remote( 'https://' + request.config.getini("perfectoURL") + '.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) - driver.implicitly_wait(35) + driver.implicitly_wait(2) TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py index 817488b1b..b83686d69 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py @@ -9,7 +9,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import string +import random import sys import allure @@ -37,6 +38,12 @@ setup_params_enterprise = { "rf": {}, "radius": True } +for sec_modes in setup_params_enterprise['ssid_modes'].keys(): + for i in range(len(setup_params_enterprise['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Bridge Mode EAP Client Connect : Suite-A") 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 ab51b4c1b..7d1895e4c 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 @@ -9,7 +9,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -37,6 +38,13 @@ setup_params_general = { "radius": False } +for sec_modes in setup_params_general['ssid_modes'].keys(): + for i in range(len(setup_params_general['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string + @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Bridge Mode Client Connect : Suite-A") @pytest.mark.InteropsuiteA @@ -297,6 +305,12 @@ setup_params_general_two = { "radius": False } +for sec_modes in setup_params_general_two['ssid_modes'].keys(): + for i in range(len(setup_params_general_two['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Bridge Mode Client Connect : Suite-B") diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py index 1e91fe739..3fa7662a3 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py @@ -10,7 +10,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -41,6 +42,12 @@ setup_params_enterprise = { "radius": True } +for sec_modes in setup_params_enterprise['ssid_modes'].keys(): + for i in range(len(setup_params_enterprise['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Bridge Mode EAP Client Connect : Suite-A") 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 682a75396..493909210 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 @@ -10,7 +10,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -39,7 +40,12 @@ setup_params_general = { "rf": {}, "radius": False } - +for sec_modes in setup_params_general['ssid_modes'].keys(): + for i in range(len(setup_params_general['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Bridge Mode Client Connect : Suite-A") @@ -290,7 +296,12 @@ setup_params_general_two = { "rf": {}, "radius": False } - +for sec_modes in setup_params_general_two['ssid_modes'].keys(): + for i in range(len(setup_params_general_two['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Bridge Mode Client Connect : Suite-B") diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_enterprise_ttls.py index a7ec71480..e2a76f04a 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/android/test_enterprise_ttls.py @@ -9,7 +9,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -37,6 +38,12 @@ setup_params_enterprise = { "rf": {}, "radius": True } +for sec_modes in setup_params_enterprise['ssid_modes'].keys(): + for i in range(len(setup_params_enterprise['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Nat Mode EAP Client Connectivity : Suite-A") 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 044918352..c002fdb73 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 @@ -9,9 +9,10 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random import sys import allure +import string if 'perfecto_libs' not in sys.path: sys.path.append(f'../libs/perfecto_libs') @@ -36,6 +37,13 @@ setup_params_general = { "rf": {}, "radius": False } +for sec_modes in setup_params_general['ssid_modes'].keys(): + for i in range(len(setup_params_general['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string + @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Nat Mode Client Connect : Suite-A") @@ -52,6 +60,8 @@ class TestNatModeConnectSuiteOne(object): """ Client Connect SuiteA pytest -m "client_connect and nat and InteropsuiteA" """ + + @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-4510", name="WIFI-4510") @pytest.mark.fiveg @pytest.mark.wpa2_personal @@ -291,6 +301,12 @@ setup_params_general_two = { "radius": False } +for sec_modes in setup_params_general_two['ssid_modes'].keys(): + for i in range(len(setup_params_general_two['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="NAT Mode Client Connect : Suite-B") diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_enterprise_ttls.py index 7a8c8c904..65a19a2cb 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/client_connect_test/iOS/test_enterprise_ttls.py @@ -10,7 +10,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -40,7 +41,12 @@ setup_params_enterprise = { "rf": {}, "radius": True } - +for sec_modes in setup_params_enterprise['ssid_modes'].keys(): + for i in range(len(setup_params_enterprise['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Nat Mode EAP Client Connect : Suite-A") 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 911292828..7f5c04577 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 @@ -10,7 +10,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -40,6 +41,12 @@ setup_params_general = { "radius": False } +for sec_modes in setup_params_general['ssid_modes'].keys(): + for i in range(len(setup_params_general['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Nat Mode Client Connect : Suite-A") @@ -291,6 +298,12 @@ setup_params_general_two = { "radius": False } +for sec_modes in setup_params_general_two['ssid_modes'].keys(): + for i in range(len(setup_params_general_two['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Nat Mode Client Connect : Suite-B") diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_enterprise_ttls.py index 415560a68..9bd90aa40 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_enterprise_ttls.py @@ -9,7 +9,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -37,6 +38,12 @@ setup_params_enterprise = { "rf": {}, "radius": True } +for sec_modes in setup_params_enterprise['ssid_modes'].keys(): + for i in range(len(setup_params_enterprise['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Vlan Mode EAP Client Connect : Suite-A") diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_general_security_modes.py index 7c1fe5839..50fcab425 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/android/test_general_security_modes.py @@ -9,7 +9,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -36,6 +37,12 @@ setup_params_general = { "rf": {}, "radius": False } +for sec_modes in setup_params_general['ssid_modes'].keys(): + for i in range(len(setup_params_general['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Vlan Mode Client Connect : Suite-A") @@ -282,7 +289,12 @@ setup_params_general_two = { "rf": {}, "radius": False } - +for sec_modes in setup_params_general_two['ssid_modes'].keys(): + for i in range(len(setup_params_general_two['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Vlan Mode Client Connect : Suite-B") diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_enterprise_ttls.py index d327f7d8f..100613af7 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_enterprise_ttls.py @@ -10,7 +10,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -40,7 +41,12 @@ setup_params_enterprise = { "rf": {}, "radius": True } - +for sec_modes in setup_params_enterprise['ssid_modes'].keys(): + for i in range(len(setup_params_enterprise['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_enterprise['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Vlan Mode EAP Client Connect : Suite-A") diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_general_security_mode.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_general_security_mode.py index 5a2b6dfe0..ad468e8e2 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_general_security_mode.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/client_connect_test/iOS/test_general_security_mode.py @@ -10,7 +10,8 @@ from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.by import By from appium import webdriver from selenium.common.exceptions import NoSuchElementException - +import random +import string import sys import allure @@ -38,7 +39,12 @@ setup_params_general = { "rf": {}, "radius": False } - +for sec_modes in setup_params_general['ssid_modes'].keys(): + for i in range(len(setup_params_general['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Vlan Mode Client Connect : Suite-A") @@ -280,7 +286,12 @@ setup_params_general_two = { "rf": {}, "radius": False } - +for sec_modes in setup_params_general_two['ssid_modes'].keys(): + for i in range(len(setup_params_general_two['ssid_modes'][sec_modes])): + N = 6 + rand_string = ''.join(random.choices(string.ascii_uppercase + + string.digits, k=N)) + setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] = setup_params_general_two['ssid_modes'][sec_modes][i]['ssid_name'] + "_"+ rand_string @allure.suite(suite_name="interop sanity") @allure.sub_suite(sub_suite_name="Vlan Mode Client Connect : Suite-B")