From 74c0b76ee6126edf9458537eedd5bae80e4dc2b0 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Fri, 30 Jul 2021 11:19:04 +0530 Subject: [PATCH] removed apnos bssid mapping logic for sanity execution Signed-off-by: shivamcandela --- libs/apnos/apnos.py | 4 +- libs/lanforge/lf_tests.py | 2 +- tests/configuration.py | 715 +++++++++++++----- tests/conftest.py | 4 +- tests/e2e/basic/conftest.py | 218 +++--- .../test_bridge_mode.py | 3 +- .../wifi_capacity_test/test_bridge_mode.py | 5 +- 7 files changed, 641 insertions(+), 310 deletions(-) diff --git a/libs/apnos/apnos.py b/libs/apnos/apnos.py index 645d8a466..554f3c462 100644 --- a/libs/apnos/apnos.py +++ b/libs/apnos/apnos.py @@ -544,7 +544,7 @@ class APNOS: if __name__ == '__main__': obj = { - 'model': 'ec420', + 'model': 'ecw5211', 'mode': 'wifi5', 'serial': '001122090801', 'jumphost': True, @@ -556,5 +556,5 @@ if __name__ == '__main__': 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin" } var = APNOS(credentials=obj, sdk="2.x") - x = var.get_ap_version_ucentral() + x = var.get_interface_details() print(x) diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index 40fa63976..2867b3e41 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -231,7 +231,7 @@ class RunTest: instance_name=instance_name, config_name="wifi_config", upstream="1.1." + upstream_port, - batch_size="1,5,10,20,40,64", + batch_size="1,5,10,20,40,64,128", loop_iter="1", protocol=protocol, duration=duration, diff --git a/tests/configuration.py b/tests/configuration.py index 122af37af..57bb19383 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -1,7 +1,41 @@ +""" +ec420 basic-03 +ecw5410 basic-04 +ecw5211 not available in basic +wf188n config +eap102 basic-06 +eap101 basic-02 +wf194c baisc-08-02 + +ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \ # basic-01 +-L 8720:lf2:4002 -L 8721:lf2:5901 -L 8722:lf2:8080 -L 8723:lab-ctlr:22 \ # basic-02 +-L 8830:lf3:4002 -L 8831:lf3:5901 -L 8832:lf3:8080 -L 8833:lab-ctlr:22 \ # basic-03 +-L 8810:lf4:4002 -L 8811:lf4:5901 -L 8812:lf4:8080 -L 8813:lab-ctlr:22 \ # basic-04 +-L 8850:lf12:4002 -L 8851:lf12:5901 -L 8852:lf12:8080 -L 8853:lab-ctlr4:22 \ # config +-L 8860:lf13:4002 -L 8861:lf13:5901 -L 8862:lf13:8080 -L 8863:lab-ctlr4:22 \ # basic-06 +-L 8870:lf14:4002 -L 8871:lf14:5901 -L 8872:lf14:8080 -L 8873:lab-ctlr4:22 \ # basic-07 +-L 8880:lf15:4002 -L 8881:lf15:5901 -L 8882:lf15:8080 -L 8883:lab-ctlr4:22 \ # basic-08 +ubuntu@3.130.51.163 + + + +ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \ +-L 8720:lf2:4002 -L 8721:lf2:5901 -L 8722:lf2:8080 -L 8723:lab-ctlr:22 \ +-L 8830:lf3:4002 -L 8831:lf3:5901 -L 8832:lf3:8080 -L 8833:lab-ctlr:22 \ +-L 8810:lf4:4002 -L 8811:lf4:5901 -L 8812:lf4:8080 -L 8813:lab-ctlr:22 \ +-L 8850:lf12:4002 -L 8851:lf12:5901 -L 8852:lf12:8080 -L 8853:lab-ctlr4:22 \ +-L 8860:lf13:4002 -L 8861:lf13:5901 -L 8862:lf13:8080 -L 8863:lab-ctlr4:22 \ +-L 8870:lf14:4002 -L 8871:lf14:5901 -L 8872:lf14:8080 -L 8873:lab-ctlr4:22 \ +-L 8880:lf15:4002 -L 8881:lf15:5901 -L 8882:lf15:8080 -L 8883:lab-ctlr4:22 \ +ubuntu@3.130.51.163 + +""" + + CONFIGURATION = { "basic-01": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the 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', @@ -13,222 +47,63 @@ CONFIGURATION = { 'mode': 'wifi5', 'serial': '3c2c99f44e77', 'jumphost': True, - 'ip': "localhost", # localhost + 'ip': "10.28.3.100", 'username': "lanforge", 'password': "pumpkin77", - 'port': 8803, # 22, - 'jumphost_tty': '/dev/ttyAP2', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" + 'port': 22, + 'jumphost_tty': '/dev/ttyAP1', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/ecw5410-2021-06-25-pending-b6743c3.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "localhost", # localhost, - "port": 8802, # 8802, - "ssh_port": 8804, - "2.4G-Radio": ["wiphy4"], - "5G-Radio": ["wiphy5"], - "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], - "upstream": "1.1.eth2", - "upstream_subnet": "10.28.2.1/24", - "uplink": "1.1.eth3", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", - "AX-Station-Name": "ax" - } - } - }, - # This is sample Config of a Testbed - "basic-ext-01": { - "controller": { - 'url': "http://wlan-portal-svc-digicert.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', # cloud controller Login - 'password': 'support', # Cloud Controller Login Password - 'version': '1.1.0-SNAPSHOT', # Controller version - 'commit_date': "2021-04-27" # Controller version sdk, commit date - }, - 'access_point': [ - { - 'model': 'ecw5410', # AP Model, can be found in ap console using "node" command - 'mode': 'wifi5', # wifi5/wifi6 can be found on AP Hardware page on Confluence - 'serial': '903cb3944873', # "node" command has serial_number information - 'jumphost': True, - # True, if you have AP On serial console and not ssh access, False, if you have AP ssh access from the machine - 'ip': "192.168.80.99", - # IP Address of System, which has AP Connected to serial cable (if jumphost is True), else - AP IP Address - 'username': "lanforge", # ssh username of system (lab-ctlr/ap) - 'password': "lanforge", # ssh password for system (lab-ctlr/ap) - 'port': 22, # 22, # ssh port for system (lab-ctlr/ap) - 'jumphost_tty': '/dev/ttyAP1', # if jumphost is True, enter the serial console device name - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" - # Enter the Target AP Version URL for Testing - } - ], - # Traffic generator - "traffic_generator": { - "name": "lanforge", # ( lanforge/ perfecto) - # Details for LANforge system - "details": { - "ip": "192.168.80.99", # localhost, - "port": 8080, # 8802, - "2.4G-Radio": ["wiphy4"], - "5G-Radio": ["wiphy5"], - "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], + "ip": "10.28.3.6", + "port": 8080, + "ssh_port": 22, + "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": "wlan0", - "5G-Station-Name": "wlan0", + "5G-Station-Name": "wlan1", "AX-Station-Name": "ax" } } - - }, - "basic-lab": { + }, # checked deployed + "basic-02": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', # cloud controller Login - 'password': 'support', # Cloud Controller Login Password - 'version': '1.1.0-SNAPSHOT', # Controller version - 'commit_date': "2021-04-27" # Controller version sdk, commit date - }, - 'access_point': [ - { - 'model': 'ecw5410', # AP Model, can be found in ap console using "node" command - 'mode': 'wifi5', # wifi5/wifi6 can be found on AP Hardware page on Confluence - 'serial': '903cb3944873', # "node" command has serial_number information - 'jumphost': True, - # True, if you have AP On serial console and not ssh access, False, if you have AP ssh access from the machine - 'ip': "localhost", - # IP Address of System, which has AP Connected to serial cable (if jumphost is True), else - AP IP Address - 'username': "lanforge", # ssh username of system (lab-ctlr/ap) - 'password': "pumpkin77", # ssh password for system (lab-ctlr/ap) - 'port': 8803, # 22, # ssh port for system (lab-ctlr/ap) - 'jumphost_tty': '/dev/ttyAP1', # if jumphost is True, enter the serial console device name - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" - # Enter the Target AP Version URL for Testing - } - ], - # Traffic generator - "traffic_generator": { - "name": "lanforge", # ( lanforge/ perfecto) - # Details for LANforge system - "details": { - "ip": "localhost", # localhost, - "port": 8802, # 8802, - "2.4G-Radio": ["wiphy4"], - "5G-Radio": ["wiphy5"], - "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], - "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" - } - } - - }, - "interop": { - "controller": { - 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the 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.0.0-SNAPSHOT', - 'commit_date': '2021-03-01' + 'version': "1.1.0-SNAPSHOT", + 'commit_date': "2021-06-01" }, 'access_point': [ { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '68215fd2f78c', - 'jumphost': True, - 'ip': "localhost", - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 8803, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "ecw5410-2021-04-26-pending-3fc41fa" - } - ], - "traffic_generator": { - "name": "Perfecto", - "details": { - "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw", - "perfectoURL": "tip" - } - } - }, - "ubasic-01": { - "controller": { - 'url': 'https://sdk-ucentral-2.cicd.lab.wlan.tip.build:16001/api/v1/oauth2', # API base url for the controller - 'username': "tip@ucentral.com", - 'password': 'openwifi', - # 'version': "1.1.0-SNAPSHOT", - # 'commit_date': "2021-04-27" - }, - 'access_point': [ - { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '903cb3944873', - 'jumphost': True, - 'ip': "192.168.52.100", # localhost - 'username': "lanforge", - 'password': "lanforge", - 'port': 22, # 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "192.168.52.100", # localhost, - "port": 8080, # 8802, - "ssh_port": 22, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy0"], - "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.52.1/24", - "uplink": "1.1.eth2", - "2.4G-Station-Name": "sta00", - "5G-Station-Name": "sta10", - "AX-Station-Name": "ax" - } - } - }, - "basic-06": { - "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': 'eap102', + 'model': 'eap101', 'mode': 'wifi6', - 'serial': '903cb39d6918', + 'serial': '34efb6af48db', 'jumphost': True, - 'ip': "10.28.3.103", # 10.28.3.103 + 'ip': "10.28.3.100", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, # 22 + 'port': 22, 'jumphost_tty': '/dev/ttyAP2', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin" + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/dev/eap101-2021-06-25-pending-b6743c3.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.30", # 10.28.3.30 - "port": 8080, # 8080 + "ip": "10.28.3.8", + "port": 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"], + "2.4G-Radio": ["wiphy4"], + "5G-Radio": ["wiphy5"], + "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], "upstream": "1.1.eth2", "upstream_subnet": "10.28.2.1/24", "uplink": "1.1.eth3", @@ -237,7 +112,7 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, + }, # checked deployed "basic-03": { "controller": { 'url': 'https://sec-ucentral-qa01.cicd.lab.wlan.tip.build:16001', # API base url for the controller @@ -302,9 +177,9 @@ CONFIGURATION = { "ip": "10.28.3.12", "port": 8080, "ssh_port": 22, - "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"], + "2.4G-Radio": ["1.1.wiphy0", "1.1.wiphy4"], + "5G-Radio": ["1.1.wiphy1", "1.1.wiphy5"], + "AX-Radio": ["1.1.wiphy2", "1.1.wiphy3"], "upstream": "1.1.eth2", "upstream_subnet": "10.28.2.1/24", "uplink": "1.1.eth3", @@ -313,10 +188,274 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - } # checked uci + }, # checked uci + "basic-05": { + "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': 'wf188n', + 'mode': 'wifi6', + 'serial': '0000c1018812', + 'jumphost': True, + 'ip': "10.28.3.103", + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, + 'jumphost_tty': '/dev/ttyAP1', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/cig_wf188/20210729-cig_wf188-v2.0.0-rc2-ec3662e-upgrade.bin" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.28", + "port": 8080, + "ssh_port": 22, + "2.4G-Radio": ["wiphy4"], + "5G-Radio": ["wiphy5"], + "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "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 uci + "basic-06": { + "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': 'eap102', + 'mode': 'wifi6', + 'serial': '903cb39d6918', + 'jumphost': True, + 'ip': "10.28.3.103", # 10.28.3.103 + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, # 22 + 'jumphost_tty': '/dev/ttyAP2', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.30", # 10.28.3.30 + "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": ["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" + } + } + }, + "basic-07": { + "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': 'wifi6', + 'serial': '903cb36ae223', + 'jumphost': True, + 'ip': "10.28.3.103", # 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/edgecore_eap101/20210729-edgecore_eap101-v2.0.0-rc2-02244b8-upgrade.bin" + } + ], + "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"], + "upstream": "1.1.eth2", + "upstream_subnet": "10.28.2.1/24", + "uplink": "1.1.eth3", + "2.4G-Station-Name": "sta10", + "5G-Station-Name": "sta00", + "AX-Station-Name": "ax" + } + } + }, # checked uci + "basic-08": { + "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': 'wf194c', + 'mode': 'wifi6', + 'serial': '089B4BB2F10C', + 'jumphost': True, + 'ip': "10.28.3.103", # 10.28.3.103 + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, # 22 + 'jumphost_tty': '/dev/ttyAP5', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/wf194c/trunk/wf194c-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.34", # 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 + "mesh": { + "controller": { + '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': [ + { + 'model': 'eap101', + 'mode': 'wifi6', + 'serial': '34efb6af4a7a', + 'jumphost': True, + 'ip': "10.28.3.101", # 10.28.3.103 + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, # 22 + 'jumphost_tty': '/dev/ttyAP2', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/trunk/eap101-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "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": { + "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': '19.07-SNAPSHOT', + 'commit_date': '2021-06-01' + }, + 'access_point': [ + { + 'model': 'ecw5410', + 'mode': 'wifi5', + 'serial': '68215fd2f78c', + 'jumphost': True, + 'ip': "10.28.3.102", + 'username': "lanforge", + '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": "Perfecto", + "details": { + "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw", + "perfectoURL": "tip" + } + } + }, + + "basic-ext-03-03": { + "controller": { + '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': '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" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "192.168.200.80", + "port": 8080, + "ssh_port": 22, + "2.4G-Radio": ["wiphy0"], + "5G-Radio": ["wiphy1"], + "AX-Radio": ["wiphy2"], + "upstream": "1.1.eth1", + "upstream_subnet": "192.168.200.1/24", + "uplink": "1.1.eth2", + "2.4G-Station-Name": "wlan0", + "5G-Station-Name": "wlan0", + "AX-Station-Name": "ax" + } + } + } } + RADIUS_SERVER_DATA = { "ip": "10.10.10.72", "port": 1812, @@ -328,7 +467,7 @@ RADIUS_SERVER_DATA = { RADIUS_ACCOUNTING_DATA = { "ip": "10.10.10.72", - "port": 1813, + "port": 1812, "secret": "testing123", "user": "user", "password": "password", @@ -409,4 +548,194 @@ PASSPOINT_PROFILE_INFO = { } } -TEST_CASES = {} \ No newline at end of file + + + +TEST_CASES = { + "ap_upgrade": 2233, + "5g_wpa2_bridge": 2236, + "2g_wpa2_bridge": 2237, + "5g_wpa_bridge": 2419, + "2g_wpa_bridge": 2420, + "2g_wpa_nat": 4323, + "5g_wpa_nat": 4324, + "2g_wpa2_nat": 4325, + "5g_wpa2_nat": 4326, + "2g_wpa2_eap_ttls_bridge": 5214, + "5g_wpa2_eap_ttls_bridge": 5215, + "2g_wpa2_eap_ttls_nat": 5216, + "5g_wpa2_eap_ttls_nat": 5217, + "cloud_connection": 5222, + "cloud_fw": 5247, + "5g_wpa2_vlan": 5248, + "5g_wpa_vlan": 5249, + "5g_wpa2_eap_ttls_vlan": 5250, + "2g_wpa2_vlan": 5251, + "2g_wpa_vlan": 5252, + "2g_wpa2_eap_ttls_vlan": 5253, + "cloud_ver": 5540, + "bridge_vifc": 5541, + "nat_vifc": 5542, + "vlan_vifc": 5543, + "bridge_vifs": 5544, + "nat_vifs": 5545, + "vlan_vifs": 5546, + "upgrade_api": 5547, + "create_fw": 5548, + "ap_profile_bridge": 5641, + "ap_profile_nat": 5642, + "ap_profile_vlan": 5643, + "ssid_2g_wpa2_eap_bridge": 5644, + "ssid_2g_wpa2_bridge": 5645, + "ssid_2g_wpa_bridge": 5646, + "ssid_5g_wpa2_eap_bridge": 5647, + "ssid_5g_wpa2_bridge": 5648, + "ssid_5g_wpa_bridge": 5649, + "ssid_2g_wpa2_eap_nat": 5650, + "ssid_2g_wpa2_nat": 5651, + "ssid_2g_wpa_nat": 5652, + "ssid_5g_wpa2_eap_nat": 5653, + "ssid_5g_wpa2_nat": 5654, + "ssid_5g_wpa_nat": 5655, + "ssid_2g_wpa2_eap_vlan": 5656, + "ssid_2g_wpa2_vlan": 5657, + "ssid_2g_wpa_vlan": 5658, + "ssid_5g_wpa2_eap_vlan": 5659, + "ssid_5g_wpa2_vlan": 5660, + "ssid_5g_wpa_vlan": 5661, + "radius_profile": 5808, + "bridge_ssid_update": 8742, + "nat_ssid_update": 8743, + "vlan_ssid_update": 8744, + "2g_wpa3_bridge": 9740, + "5g_wpa3_bridge": 9741, + "ssid_2g_wpa3_bridge": 9742, + "ssid_5g_wpa3_bridge": 9743, + "ssid_2g_wpa3_nat": 9744, + "ssid_5g_wpa3_nat": 9745, + "ssid_2g_wpa3_vlan": 9746, + "ssid_5g_wpa3_vlan": 9747, + "2g_wpa3_nat": 9748, + "5g_wpa3_nat": 9749, + "2g_wpa3_vlan": 9750, + "5g_wpa3_vlan": 9751, + "ssid_2g_wpa3_eap_bridge": 9752, + "ssid_5g_wpa3_eap_bridge": 9753, + "2g_wpa3_eap_ttls_bridge": 9754, + "5g_wpa3_eap_ttls_bridge": 9755, + "ssid_2g_wpa3_eap_nat": 9756, + "ssid_5g_wpa3_eap_nat": 9757, + "ssid_2g_wpa3_eap_vlan": 9758, + "ssid_5g_wpa3_eap_vlan": 9759, + "2g_wpa3_eap_ttls_nat": 9760, + "5g_wpa3_eap_ttls_nat": 9761, + "2g_wpa3_eap_ttls_vlan": 9762, + "5g_wpa3_eap_ttls_vlan": 9763, + "ssid_2g_wpa3_mixed_bridge": 9764, + "ssid_5g_wpa3_mixed_bridge": 9765, + "2g_wpa3_mixed_eap_ttls_wpa3_bridge": 9766, + "2g_wpa3_mixed_wpa3_bridge": 9767, + "5g_wpa3_mixed_eap_ttls_wpa3_bridge": 9768, + "5g_wpa3_mixed_wpa3_bridge": 9769, + "ssid_2g_wpa3_mixed_nat": 9770, + "ssid_5g_wpa3_mixed_nat": 9771, + "ssid_2g_wpa3_mixed_vlan": 9772, + "ssid_5g_wpa3_mixed_vlan": 9773, + # "2g_wpa3_mixed_wpa2_nat": 9774, + "2g_wpa3_mixed_wpa3_nat": 9775, + # "5g_wpa3_mixed_wpa2_nat": 9776, + "5g_wpa3_mixed_wpa3_nat": 9777, + # "2g_wpa3_mixed_wpa2_vlan": 9778, + "2g_wpa3_mixed_wpa3_vlan": 9779, + # "5g_wpa3_mixed_wpa2_vlan": 9780, + "5g_wpa3_mixed_wpa3_vlan": 9781, + "ssid_2g_wpa3_enterprise_mixed_bridge": 9782, + "ssid_5g_wpa3_enterprise_mixed_bridge": 9783, + "2g_wpa2_mixed_eap_wpa2_bridge": 9784, + "2g_wpa3_mixed_eap_wpa3_bridge": 9785, + "5g_wpa3_mixed_eap_wpa2_bridge": 9786, + "5g_wpa3_mixed_eap_wpa3_bridge": 9787, + "ssid_2g_wpa3_enterprise_mixed_nat": 9788, + "ssid_5g_wpa3_enterprise_mixed_nat": 9789, + "2g_wpa3_mixed_eap_wpa2_nat": 9790, + "2g_wpa3_mixed_eap_ttls_wpa3_nat": 9791, + "5g_wpa3_mixed_eap_wpa2_nat": 9792, + "5g_wpa3_mixed_eap_ttls_wpa3_nat": 9793, + "ssid_2g_wpa3_enterprise_mixed_vlan": 9794, + "ssid_5g_wpa3_enterprise_mixed_vlan": 9795, + "2g_wpa3_mixed_eap_wpa2_vlan": 9796, + "2g_wpa3_mixed_eap_ttls_wpa3_vlan": 9797, + "5g_wpa3_mixed_eap_wpa2_vlan": 9798, + "5g_wpa3_mixed_eap_ttls_wpa3_vlan": 9799, + "ssid_2g_open_bridge": 9805, + "ssid_5g_open_bridge": 9806, + "ssid_2g_open_nat": 9807, + "ssid_5g_open_nat": 9808, + "ssid_2g_open_vlan": 9809, + "ssid_5g_open_vlan": 9810, + "ssid_2g_wpa2_mixed_bridge": 9811, + "ssid_5g_wpa2_mixed_bridge": 9812, + "ssid_2g_wpa2_mixed_nat": 9813, + "ssid_5g_wpa2_mixed_nat": 9814, + "ssid_2g_wpa2_mixed_vlan": 9815, + "ssid_5g_wpa2_mixed_vlan": 9817, + "ssid_2g_wpa_wpa2_enterprise_mixed_bridge": 9818, + "ssid_5g_wpa_wpa2_enterprise_mixed_bridge": 9819, + "ssid_2g_wpa_wpa2_enterprise_mixed_nat": 9820, + "ssid_5g_wpa_wpa2_enterprise_mixed_nat": 9821, + "ssid_2g_wpa_wpa2_enterprise_mixed_vlan": 9822, + "ssid_5g_wpa_wpa2_enterprise_mixed_vlan": 9823, + "ssid_2g_wpa_eap_bridge": 9824, + "ssid_5g_wpa_eap_bridge": 9825, + # "ssid_2g_wpa2_eap_bridge": 9824, + # "ssid_5g_wpa2_eap_bridge": 9825, + "ssid_2g_wpa_eap_nat": 9826, + "ssid_5g_wpa_eap_nat": 9827, + "ssid_2g_wpa_eap_vlan": 9828, + "ssid_5g_wpa_eap_vlan": 9829, + # "ap_update_bridge": 9856, + # "ap_update_nat": 9857, + # "ap_update_vlan": 9858, + # "bridge_vifc_update": 9859, + # "nat_vifc_update": 9860, + # "vlan_vifc_update": 9861, + # "bridge_vifs_update": 9862, + # "nat_vifs_update": 9863, + # "vlan_vifs_update": 9864, + "2g_wpa_eap_ttls_bridge": 9867, + "5g_wpa_eap_ttls_bridge": 9768, + "2g_wpa_eap_ttls_nat": 9869, + "5g_wpa_eap_ttls_nat": 9770, + "2g_wpa_eap_ttls_vlan": 9871, + "5g_wpa_eap_ttls_vlan": 9872, + # "2g_wpa2_mixed_eap_wpa_bridge": 9873, + "2g_wpa2_mixed_eap_ttls_wpa2_bridge": 9874, + # "5g_wpa2_mixed_eap_wpa_bridge": 9875, + "5g_wpa2_mixed_eap_ttls_wpa2_bridge": 9876, + # "2g_wpa2_mixed_eap_wpa_nat": 9877, + "2g_wpa2_mixed_eap_ttls_wpa2_nat": 9878, + # "5g_wpa2_mixed_eap_wpa_nat": 9879, + "5g_wpa2_mixed_eap_ttls_wpa2_nat": 9880, + # "2g_wpa2_mixed_eap_wpa_vlan": 9881, + "2g_wpa2_mixed_eap_ttls_wpa2_vlan": 9882, + # "5g_wpa2_mixed_eap_wpa_vlan": 9883, + "5g_wpa2_mixed_eap_ttls_wpa2_vlan": 9884, + # "2g_wpa2_mixed_wpa_bridge": 9885, + "2g_wpa2_mixed_wpa2_bridge": 9886, + # "5g_wpa2_mixed_wpa_bridge": 9887, + "5g_wpa2_mixed_wpa2_bridge": 9888, + # "2g_wpa2_mixed_wpa_nat": 9889, + "2g_wpa2_mixed_wpa2_nat": 9890, + # "5g_wpa2_mixed_wpa_nat": 9891, + "5g_wpa2_mixed_wpa2_nat": 9892, + # "2g_wpa2_mixed_wpa_vlan": 9893, + "2g_wpa2_mixed_wpa2_vlan": 9894, + # "5g_wpa2_mixed_wpa_vlan": 9895, + "5g_wpa2_mixed_wpa2_vlan": 9896, + "2g_open_bridge": 2234, + "5g_open_bridge": 2235, + "2g_open_nat": 4321, + "5g_open_nat": 4322, + "2g_open_vlan": 9897, + "5g_open_vlan": 9898 +} diff --git a/tests/conftest.py b/tests/conftest.py index 99d8f1854..a4050b514 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -508,14 +508,12 @@ def get_markers(request, get_security_flags): for item in session.items: for j in item.iter_markers(): markers.append(j.name) - # print(set(markers)) for i in security: if set(markers).__contains__(i): security_dict[i] = True else: security_dict[i] = False - # print(security_dict) - allure.attach(body=str(security_dict), name="Test Cases Requires: ") + yield security_dict diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py index c9f39542d..bd7775e68 100644 --- a/tests/e2e/basic/conftest.py +++ b/tests/e2e/basic/conftest.py @@ -804,115 +804,115 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment allure.attach(name="Config Info", body="AP is Not Broadcasting Applied Config: " + str(allure_body)) ap_logs = ap_ssh.logread() allure.attach(body=ap_logs, name="AP LOgs: ") - ap_wifi_data = ap_ssh.get_interface_details() - idx_mapping = {} - ssid_data = [] - ap_interfaces = list(ap_wifi_data.keys()) - for interface in range(len(ap_interfaces)): - if ap_wifi_data[ap_interfaces[interface]][1] == "none": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=OPEN" + - " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] - ] - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - if ap_wifi_data[ap_interfaces[interface]][1] == "psk": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=WPA" + - " password=" + ap_wifi_data[ap_interfaces[interface]][2] + - " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] - ] - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - if ap_wifi_data[ap_interfaces[interface]][1] == "psk-mixed": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=WPA|WPA2" + - " password=" + ap_wifi_data[ap_interfaces[interface]][2] + - " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] - ] - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - if ap_wifi_data[ap_interfaces[interface]][1] == "psk2": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=WPA2" + - " password=" + ap_wifi_data[ap_interfaces[interface]][2] + - " bssid=" + str(ap_wifi_data[ap_interfaces[interface]][3][0]).lower() - ] - print(ssid) - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - if ap_wifi_data[ap_interfaces[interface]][1] == "sae": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=WPA3" + - " password=" + ap_wifi_data[ap_interfaces[interface]][2] + - " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] - ] - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - if ap_wifi_data[ap_interfaces[interface]][1] == "sae-mixed": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=WPA3" + - " password=" + ap_wifi_data[ap_interfaces[interface]][2] + - " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] - ] - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - if ap_wifi_data[ap_interfaces[interface]][1] == "wpa2": - ssid = ["ssid_idx=" + str(interface) + - " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + - " security=EAP-TTLS" + - " bssid=" + str(ap_wifi_data[ap_interfaces[interface]][3][0]).lower() - ] - - idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], - ap_wifi_data[ap_interfaces[interface]][2], - ap_wifi_data[ap_interfaces[interface]][1], - ap_wifi_data[ap_interfaces[interface]][3][1], - ap_wifi_data[ap_interfaces[interface]][3][0] - ] - # pass - ssid_data.append(ssid) - lf_tools.ssid_list.append(ap_wifi_data[ap_interfaces[interface]][0]) - lf_tools.dut_idx_mapping = idx_mapping - print(ssid_data) - lf_tools.reset_scenario() - lf_tools.update_ssid(ssid_data=ssid_data) + # ap_wifi_data = ap_ssh.get_interface_details() + # idx_mapping = {} + # ssid_data = [] + # ap_interfaces = list(ap_wifi_data.keys()) + # for interface in range(len(ap_interfaces)): + # if ap_wifi_data[ap_interfaces[interface]][1] == "none": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=OPEN" + + # " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # if ap_wifi_data[ap_interfaces[interface]][1] == "psk": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=WPA" + + # " password=" + ap_wifi_data[ap_interfaces[interface]][2] + + # " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # if ap_wifi_data[ap_interfaces[interface]][1] == "psk-mixed": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=WPA|WPA2" + + # " password=" + ap_wifi_data[ap_interfaces[interface]][2] + + # " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # if ap_wifi_data[ap_interfaces[interface]][1] == "psk2": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=WPA2" + + # " password=" + ap_wifi_data[ap_interfaces[interface]][2] + + # " bssid=" + str(ap_wifi_data[ap_interfaces[interface]][3][0]).lower() + # ] + # print(ssid) + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # if ap_wifi_data[ap_interfaces[interface]][1] == "sae": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=WPA3" + + # " password=" + ap_wifi_data[ap_interfaces[interface]][2] + + # " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # if ap_wifi_data[ap_interfaces[interface]][1] == "sae-mixed": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=WPA3" + + # " password=" + ap_wifi_data[ap_interfaces[interface]][2] + + # " bssid=" + ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # if ap_wifi_data[ap_interfaces[interface]][1] == "wpa2": + # ssid = ["ssid_idx=" + str(interface) + + # " ssid=" + ap_wifi_data[ap_interfaces[interface]][0] + + # " security=EAP-TTLS" + + # " bssid=" + str(ap_wifi_data[ap_interfaces[interface]][3][0]).lower() + # ] + # + # idx_mapping[str(interface)] = [ap_wifi_data[ap_interfaces[interface]][0], + # ap_wifi_data[ap_interfaces[interface]][2], + # ap_wifi_data[ap_interfaces[interface]][1], + # ap_wifi_data[ap_interfaces[interface]][3][1], + # ap_wifi_data[ap_interfaces[interface]][3][0] + # ] + # # pass + # ssid_data.append(ssid) + # lf_tools.ssid_list.append(ap_wifi_data[ap_interfaces[interface]][0]) + # lf_tools.dut_idx_mapping = idx_mapping + # print(ssid_data) + # lf_tools.reset_scenario() + # lf_tools.update_ssid(ssid_data=ssid_data) if request.param["mode"] == "VLAN": lf_tools.add_vlan(vlan_ids=vlan_list) yield test_cases diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py index 683b8fa4e..f6a103aec 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py @@ -9,7 +9,7 @@ import pytest import allure pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, - pytest.mark.bridge]#, pytest.mark.usefixtures("setup_test_run")] + pytest.mark.bridge] # , pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "BRIDGE", @@ -21,6 +21,7 @@ setup_params_general = { "radius": False } + @allure.suite("performance") @allure.feature("BRIDGE MODE Dataplane Throughput Test") @pytest.mark.parametrize( diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py index 4d0721e41..c2df6d715 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py @@ -32,10 +32,11 @@ setup_params_general_dual_band = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.wpa2_personal +@pytest.mark.bridge @pytest.mark.twog @pytest.mark.fiveg @pytest.mark.dual_band +@pytest.mark.wpa2_personal @pytest.mark.wifi_capacity_test class TestWifiCapacityBRIDGEModeDualBand(object): """ Wifi Capacity Test BRIDGE mode @@ -53,6 +54,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object): ssid_name = profile_data["ssid_name"] mode = "BRIDGE" vlan = 1 + get_vif_state.append(ssid_name) if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -81,6 +83,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object): ssid_name = profile_data["ssid_name"] mode = "BRIDGE" vlan = 1 + get_vif_state.append(ssid_name) if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")