wct initial cleanup

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-06-01 16:45:33 +05:30
parent 15d682a3bb
commit 9f4495aa93
5 changed files with 98 additions and 321 deletions

View File

@@ -51,9 +51,8 @@ class RunTest:
os.mkdir(self.local_report_path)
def Client_Connectivity(self, ssid="[BLANK]", passkey="[BLANK]", security="open", extra_securities=[],
station_name=[],
mode="BRIDGE", vlan_id=1, band="twog"):
'''SINGLE CLIENT CONNECTIVITY using test_connect2.py'''
station_name=[], mode="BRIDGE", vlan_id=1, band="twog"):
"""SINGLE CLIENT CONNECTIVITY using test_connect2.py"""
self.staConnect.sta_mode = 0
self.staConnect.upstream_resource = 1
if mode == "BRIDGE":

View File

@@ -52,8 +52,6 @@ class ChamberView:
)
self.CreateDut.ssid = []
def Chamber_View(self):
if self.delete_old_scenario:
self.CreateChamberview.clean_cv_scenario(type="Network-Connectivity", scenario_name=self.scenario_name)
@@ -67,7 +65,6 @@ class ChamberView:
self.CreateChamberview.sync_cv()
return self.CreateChamberview, self.scenario_name
def Create_Dut(self):
self.CreateDut.setup()
self.CreateDut.add_ssids()
@@ -88,7 +85,7 @@ class ChamberView:
# ]
pass
def json_get(self,_req_url="/"):
cli_base = LFCliBase(_lfjson_host=self.lanforge_ip, _lfjson_port=self.lanforge_port,)
def json_get(self, _req_url="/"):
cli_base = LFCliBase(_lfjson_host=self.lanforge_ip, _lfjson_port=self.lanforge_port, )
json_response = cli_base.json_get(_req_url=_req_url)
return json_response

View File

@@ -1,32 +1,16 @@
"""
Performance : Wifi Capacity Test : Bridge Mode
"""
import pytest
import sys
import time
from lf_wifi_capacity_test import WiFiCapacityTest
from create_station import CreateStation
pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.bridge]
for folder in 'py-json', 'py-scripts':
if folder not in sys.path:
sys.path.append(f'../lanforge/lanforge-scripts/{folder}')
sys.path.append(f"../lanforge/lanforge-scripts/py-scripts/tip-cicd-sanity")
sys.path.append(f'../libs')
sys.path.append(f'../libs/lanforge/')
from LANforge.LFUtils import *
from sta_connect2 import StaConnect2
from eap_connect import EAPConnect
import allure
pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.bridge]
setup_params_general = {
"mode": "BRIDGE",
"ssid_modes": {
"open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]},
{"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}],
"wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
{"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
"security_key": "something"}],
"wpa2_personal": [
{"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
@@ -36,10 +20,6 @@ setup_params_general = {
}
def lanforge_ip(args):
pass
@pytest.mark.basic
@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY")
@pytest.mark.parametrize(
@@ -51,89 +31,36 @@ def lanforge_ip(args):
@pytest.mark.usefixtures("setup_profiles")
class TestWifiCapacityBridgeMode(object):
@pytest.mark.wpa
@pytest.mark.mutto
@pytest.mark.twog
def test_client_wpa_2g(self, test_cases,lf_test):
print("********** test_client_wpa_2g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa"][0]
print(profile_data)
'''create_station = CreateStation(_host = lf_test.lanforge_ip,
_port = lf_test.lanforge_port,
_ssid = profile_data["ssid_name"],
_password = profile_data["security_key"],
_security = "wpa",
_sta_list = ['1.1.sta0000','1.1.sta0001'],
_radio = lf_test.twog_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity( ssid = profile_data["ssid_name"], paswd = profile_data["security_key"],
security = "wpa", mode = "BRIDGE", band = "twog", instance_name = "wct_instance", )
assert PASS
@pytest.mark.wpa
@pytest.mark.fiveg
def test_client_wpa_5g(self, test_cases, lf_test):
print("********** test_client_wpa_5g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa"][1]
print(profile_data)
'''create_station = CreateStation(_host=lf_test.lanforge_ip,
_port=lf_test.lanforge_port,
_ssid=profile_data["ssid_name"],
_password=profile_data["security_key"],
_security="wpa",
_sta_list=['1.1.sta0000', '1.1.sta0001'],
_radio=lf_test.fiveg_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa", mode="BRIDGE", band="fiveg",
instance_name="wct_instance", )
assert PASS
@pytest.mark.wpa2_personal
@pytest.mark.twog
def test_client_wpa2_personal_2g(self, test_cases,lf_test):
print("********** test_client_wpa2_personal_2g ***********")
def test_client_wpa2_personal_2g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
print(profile_data)
'''create_station = CreateStation(_host = lf_test.lanforge_ip,
_port = lf_test.lanforge_port,
_ssid = profile_data["ssid_name"],
_password = profile_data["security_key"],
_security = "wpa2",
_sta_list = ['1.1.sta0000','1.1.sta0001'],
_radio = lf_test.twog_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity( ssid = profile_data["ssid_name"], paswd = profile_data["security_key"],
security = "wpa2", mode = "BRIDGE", band = "twog",
instance_name = "wct_instance", )
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "BRIDGE"
band = "twog"
vlan = 1
dut_name = create_lanforge_chamberview_dut
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa2", mode="BRIDGE", band="twog",
instance_name="wct_instance", )
assert PASS
@pytest.mark.wpa2_personal
@pytest.mark.fiveg
def test_client_wpa2_personal_5g(self, test_cases, lf_test):
print("********** test_client_wpa2_personal_5g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
print(profile_data)
'''create_station = CreateStation(_host=lf_test.lanforge_ip,
_port=lf_test.lanforge_port,
_ssid=profile_data["ssid_name"],
_password=profile_data["security_key"],
_security="wpa2",
_sta_list=['1.1.sta0000', '1.1.sta0001'],
_radio=lf_test.fiveg_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity( ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa2", mode="BRIDGE", band="fiveg",
def test_client_wpa2_personal_2g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "BRIDGE"
band = "fiveg"
vlan = 1
dut_name = create_lanforge_chamberview_dut
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security=security, mode=mode, band=band,
instance_name="wct_instance", )
assert PASS

View File

@@ -1,32 +1,16 @@
"""
Performance : Wifi Capacity Test : NAT Mode
"""
import pytest
import sys
import time
from lf_wifi_capacity_test import WiFiCapacityTest
from create_station import CreateStation
pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.nat]
for folder in 'py-json', 'py-scripts':
if folder not in sys.path:
sys.path.append(f'../lanforge/lanforge-scripts/{folder}')
sys.path.append(f"../lanforge/lanforge-scripts/py-scripts/tip-cicd-sanity")
sys.path.append(f'../libs')
sys.path.append(f'../libs/lanforge/')
from LANforge.LFUtils import *
from sta_connect2 import StaConnect2
from eap_connect import EAPConnect
import allure
pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.nat]
setup_params_general = {
"mode": "NAT",
"ssid_modes": {
"open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]},
{"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}],
"wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
{"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
"security_key": "something"}],
"wpa2_personal": [
{"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
@@ -36,10 +20,6 @@ setup_params_general = {
}
def lanforge_ip(args):
pass
@pytest.mark.basic
@allure.feature("NAT MODE CLIENT CONNECTIVITY")
@pytest.mark.parametrize(
@@ -49,91 +29,38 @@ def lanforge_ip(args):
scope="class"
)
@pytest.mark.usefixtures("setup_profiles")
class TestWifiCapacityNatMode(object):
@pytest.mark.wpa
@pytest.mark.mutto
@pytest.mark.twog
def test_client_wpa_2g(self, test_cases,lf_test):
print("********** test_client_wpa_2g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa"][0]
print(profile_data)
'''create_station = CreateStation(_host = lf_test.lanforge_ip,
_port = lf_test.lanforge_port,
_ssid = profile_data["ssid_name"],
_password = profile_data["security_key"],
_security = "wpa",
_sta_list = ['1.1.sta0000','1.1.sta0001'],
_radio = lf_test.twog_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity(ssid = profile_data["ssid_name"], paswd = profile_data["security_key"],
security = "wpa", mode = "NAT", band = "twog", instance_name = "wct_instance", )
assert PASS
@pytest.mark.wpa
@pytest.mark.fiveg
def test_client_wpa_5g(self, test_cases, lf_test):
print("********** test_client_wpa_5g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa"][1]
print(profile_data)
'''create_station = CreateStation(_host=lf_test.lanforge_ip,
_port=lf_test.lanforge_port,
_ssid=profile_data["ssid_name"],
_password=profile_data["security_key"],
_security="wpa",
_sta_list=['1.1.sta0000', '1.1.sta0001'],
_radio=lf_test.fiveg_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa", mode="NAT", band="fiveg",
instance_name="wct_instance", )
assert PASS
class TestWifiCapacityNATMode(object):
@pytest.mark.wpa2_personal
@pytest.mark.twog
def test_client_wpa2_personal_2g(self, test_cases,lf_test):
print("********** test_client_wpa2_personal_2g ***********")
def test_client_wpa2_personal_2g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
print(profile_data)
'''create_station = CreateStation(_host = lf_test.lanforge_ip,
_port = lf_test.lanforge_port,
_ssid = profile_data["ssid_name"],
_password = profile_data["security_key"],
_security = "wpa2",
_sta_list = ['1.1.sta0000','1.1.sta0001'],
_radio = lf_test.twog_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity( ssid = profile_data["ssid_name"], paswd = profile_data["security_key"],
security = "wpa2", mode = "NAT", band = "twog",
instance_name = "wct_instance", )
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "NAT"
band = "twog"
vlan = 1
dut_name = create_lanforge_chamberview_dut
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa2", mode="NAT", band="twog",
instance_name="wct_instance", )
assert PASS
@pytest.mark.wpa2_personal
@pytest.mark.fiveg
def test_client_wpa2_personal_5g(self, test_cases, lf_test):
print("********** test_client_wpa2_personal_5g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
print(profile_data)
'''create_station = CreateStation(_host=lf_test.lanforge_ip,
_port=lf_test.lanforge_port,
_ssid=profile_data["ssid_name"],
_password=profile_data["security_key"],
_security="wpa2",
_sta_list=['1.1.sta0000', '1.1.sta0001'],
_radio=lf_test.fiveg_radios)
create_station.build()
time.sleep(20)'''
def test_client_wpa2_personal_2g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "NAT"
band = "fiveg"
vlan = 1
dut_name = create_lanforge_chamberview_dut
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa2", mode="NAT", band="fiveg",
security=security, mode=mode, band=band,
instance_name="wct_instance", )
assert PASS

View File

@@ -1,32 +1,16 @@
"""
Performance : Wifi Capacity Test : VLAN Mode
"""
import pytest
import sys
import time
from lf_wifi_capacity_test import WiFiCapacityTest
from create_station import CreateStation
pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.vlan]
for folder in 'py-json', 'py-scripts':
if folder not in sys.path:
sys.path.append(f'../lanforge/lanforge-scripts/{folder}')
sys.path.append(f"../lanforge/lanforge-scripts/py-scripts/tip-cicd-sanity")
sys.path.append(f'../libs')
sys.path.append(f'../libs/lanforge/')
from LANforge.LFUtils import *
from sta_connect2 import StaConnect2
from eap_connect import EAPConnect
import allure
pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.vlan]
setup_params_general = {
"mode": "VLAN",
"ssid_modes": {
"open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]},
{"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}],
"wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
{"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
"security_key": "something"}],
"wpa2_personal": [
{"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
@@ -36,10 +20,6 @@ setup_params_general = {
}
def lanforge_ip(args):
pass
@pytest.mark.basic
@allure.feature("VLAN MODE CLIENT CONNECTIVITY")
@pytest.mark.parametrize(
@@ -49,91 +29,38 @@ def lanforge_ip(args):
scope="class"
)
@pytest.mark.usefixtures("setup_profiles")
class TestWifiCapacityVlanMode(object):
@pytest.mark.wpa
@pytest.mark.mutto
@pytest.mark.twog
def test_client_wpa_2g(self, test_cases,lf_test):
print("********** test_client_wpa_2g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa"][0]
print(profile_data)
'''create_station = CreateStation(_host = lf_test.lanforge_ip,
_port = lf_test.lanforge_port,
_ssid = profile_data["ssid_name"],
_password = profile_data["security_key"],
_security = "wpa",
_sta_list = ['1.1.sta0000','1.1.sta0001'],
_radio = lf_test.twog_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity(ssid = profile_data["ssid_name"], paswd = profile_data["security_key"],
security = "wpa", mode = "VLAN", band = "twog", instance_name = "wct_instance", )
assert PASS
@pytest.mark.wpa
@pytest.mark.fiveg
def test_client_wpa_5g(self, test_cases, lf_test):
print("********** test_client_wpa_5g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa"][1]
print(profile_data)
'''create_station = CreateStation(_host=lf_test.lanforge_ip,
_port=lf_test.lanforge_port,
_ssid=profile_data["ssid_name"],
_password=profile_data["security_key"],
_security="wpa",
_sta_list=['1.1.sta0000', '1.1.sta0001'],
_radio=lf_test.fiveg_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa", mode="VLAN", band="fiveg",
instance_name="wct_instance", )
assert PASS
class TestWifiCapacityVLANMode(object):
@pytest.mark.wpa2_personal
@pytest.mark.twog
def test_client_wpa2_personal_2g(self, test_cases,lf_test):
print("********** test_client_wpa2_personal_2g ***********")
def test_client_wpa2_personal_2g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
print(profile_data)
'''create_station = CreateStation(_host = lf_test.lanforge_ip,
_port = lf_test.lanforge_port,
_ssid = profile_data["ssid_name"],
_password = profile_data["security_key"],
_security = "wpa2",
_sta_list = ['1.1.sta0000','1.1.sta0001'],
_radio = lf_test.twog_radios)
create_station.build()
time.sleep(20)'''
PASS = lf_test.wifi_capacity( ssid = profile_data["ssid_name"], paswd = profile_data["security_key"],
security = "wpa2", mode = "VLAN", band = "twog",
instance_name = "wct_instance", )
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "VLAN"
band = "twog"
vlan = 1
dut_name = create_lanforge_chamberview_dut
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa2", mode="VLAN", band="twog",
instance_name="wct_instance", )
assert PASS
@pytest.mark.wpa2_personal
@pytest.mark.fiveg
def test_client_wpa2_personal_5g(self, test_cases, lf_test):
print("********** test_client_wpa2_personal_5g ***********")
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
print(profile_data)
'''create_station = CreateStation(_host=lf_test.lanforge_ip,
_port=lf_test.lanforge_port,
_ssid=profile_data["ssid_name"],
_password=profile_data["security_key"],
_security="wpa2",
_sta_list=['1.1.sta0000', '1.1.sta0001'],
_radio=lf_test.fiveg_radios)
create_station.build()
time.sleep(20)'''
def test_client_wpa2_personal_2g(self, lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"]
security_key = profile_data["security_key"]
security = "wpa2"
mode = "VLAN"
band = "fiveg"
vlan = 1
dut_name = create_lanforge_chamberview_dut
PASS = lf_test.wifi_capacity(ssid=profile_data["ssid_name"], paswd=profile_data["security_key"],
security="wpa2", mode="VLAN", band="fiveg",
security=security, mode=mode, band=band,
instance_name="wct_instance", )
assert PASS