added some improvements in logic

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-03-24 01:55:48 +05:30
parent 7380b87ad3
commit a3edf2c02b
7 changed files with 246 additions and 201 deletions

View File

@@ -602,6 +602,7 @@ class FirmwareUtility(JFrogUtility):
time.sleep(5) time.sleep(5)
try: try:
obj = self.equipment_gateway_client.request_firmware_update(equipment_id=equipment_id, firmware_version_id=firmware_id) obj = self.equipment_gateway_client.request_firmware_update(equipment_id=equipment_id, firmware_version_id=firmware_id)
time.sleep(60)
except Exception as e: except Exception as e:
obj = False obj = False
return obj return obj

View File

@@ -11,26 +11,35 @@
### Note: Run all the tests from "tests" directory ### Note: Run all the tests from "tests" directory
Modify pytest.ini based on the config for your setup
You can modify the ini options by using switch -o
## Examples: ## Examples:
Following are the examples for Running Client Connectivity Test with different Combinations: Following are the examples for Running Client Connectivity Test with different Combinations:
# Run the sanity test in all modes across wpa, wpa2 and eap) # Run the sanity test in all modes across wpa, wpa2 and eap)
pytest -m "sanity and wpa and wpa2 and eap" -s pytest -m sanity -s
# Run the sanity test in all modes across wpa, wpa2) # Run the sanity test in all modes except wpa2_enterprise)
pytest -m "sanity and wpa and wpa2" -s pytest -m "sanity and not wpa2_enterprise" -s
# Run the bridge test in all modes across wpa, wpa2 and eap) # Run the bridge test in all modes across wpa, wpa2 and eap)
pytest -m "bridge and wpa and wpa2 and eap" -s pytest -m bridge -s
# Run the bridge test in all modes across wpa, wpa2) # Run the bridge test in all modes except wpa2_enterprise)
pytest -m "bridge and wpa and wpa2" -s pytest -m "bridge and not wpa2_enterprise" -s
# Run the nat test in all modes across wpa, wpa2 and eap) # Run the nat test in all modes across wpa, wpa2 and eap)
pytest -m "nat and wpa and wpa2 and eap" -s pytest -m nat -s
# Run the nat test in all modes across wpa, wpa2) # Run the nat test in all modes except wpa2_enterprise)
pytest -m "nat and wpa and wpa2" -s pytest -m "nat and not wpa2_enterprise" -s
# Run the vlan test in all modes across wpa, wpa2 and eap)
pytest -m vlan -s
# Run the vlan test in all modes except wpa2_enterprise)
pytest -m "vlan and not wpa2_enterprise" -s
Following are the examples for cloudSDK standalone tests Following are the examples for cloudSDK standalone tests

View File

@@ -5,6 +5,8 @@ for folder in 'py-json', 'py-scripts':
if folder not in sys.path: if folder not in sys.path:
sys.path.append(f'../lanforge/lanforge-scripts/{folder}') 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')
sys.path.append(f'../libs/lanforge/') sys.path.append(f'../libs/lanforge/')
@@ -29,7 +31,8 @@ class TestBridgeModeClientConnectivity(object):
def test_single_client_wpa2_personal_5g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode, def test_single_client_wpa2_personal_5g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_bridge_mode[3]['wpa2_personal']['5g'] profile_data = setup_bridge_mode[3]['wpa2_personal']['5g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -64,7 +67,8 @@ class TestBridgeModeClientConnectivity(object):
def test_single_client_wpa2_personal_2g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode, def test_single_client_wpa2_personal_2g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_bridge_mode[3]['wpa2_personal']['2g'] profile_data = setup_bridge_mode[3]['wpa2_personal']['2g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -99,7 +103,8 @@ class TestBridgeModeClientConnectivity(object):
def test_single_client_wpa_5g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode, def test_single_client_wpa_5g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_bridge_mode[3]['wpa']['5g'] profile_data = setup_bridge_mode[3]['wpa']['5g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -134,7 +139,8 @@ class TestBridgeModeClientConnectivity(object):
def test_single_client_wpa_2g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode, def test_single_client_wpa_2g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_bridge_mode[3]['wpa']['2g'] profile_data = setup_bridge_mode[3]['wpa']['2g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -169,7 +175,7 @@ class TestBridgeModeClientConnectivity(object):
def test_single_client_wpa2_enterprise_5g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode, def test_single_client_wpa2_enterprise_5g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_bridge_mode[3]['wpa2_enterprise']['5g'] profile_data = setup_bridge_mode[3]['wpa2_enterprise']['5g']
eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080) eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
eap_connect.upstream_resource = 1 eap_connect.upstream_resource = 1
eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"] eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
eap_connect.security = "wpa2" eap_connect.security = "wpa2"
@@ -195,7 +201,6 @@ class TestBridgeModeClientConnectivity(object):
print("Single Client Connectivity :", eap_connect.passes) print("Single Client Connectivity :", eap_connect.passes)
assert eap_connect.passes() assert eap_connect.passes()
@pytest.mark.sanity @pytest.mark.sanity
@pytest.mark.bridge @pytest.mark.bridge
@pytest.mark.wpa2_enterprise @pytest.mark.wpa2_enterprise
@@ -203,7 +208,7 @@ class TestBridgeModeClientConnectivity(object):
def test_single_client_wpa2_enterprise_2g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode, def test_single_client_wpa2_enterprise_2g(self, setup_cloudsdk, upgrade_firmware, setup_bridge_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_bridge_mode[3]['wpa2_enterprise']['2g'] profile_data = setup_bridge_mode[3]['wpa2_enterprise']['2g']
eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080) eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
eap_connect.upstream_resource = 1 eap_connect.upstream_resource = 1
eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"] eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
eap_connect.security = "wpa2" eap_connect.security = "wpa2"

View File

@@ -5,6 +5,8 @@ for folder in 'py-json', 'py-scripts':
if folder not in sys.path: if folder not in sys.path:
sys.path.append(f'../lanforge/lanforge-scripts/{folder}') 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')
sys.path.append(f'../libs/lanforge/') sys.path.append(f'../libs/lanforge/')
@@ -19,7 +21,6 @@ import eap_connect
from eap_connect import EAPConnect from eap_connect import EAPConnect
import time import time
class TestNATModeClientConnectivity(object): class TestNATModeClientConnectivity(object):
@pytest.mark.sanity @pytest.mark.sanity
@@ -29,7 +30,7 @@ class TestNATModeClientConnectivity(object):
def test_single_client_wpa2_personal_5g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode, def test_single_client_wpa2_personal_5g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_nat_mode[3]['wpa2_personal']['5g'] profile_data = setup_nat_mode[3]['wpa2_personal']['5g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]), debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -64,7 +65,7 @@ class TestNATModeClientConnectivity(object):
def test_single_client_wpa2_personal_2g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode, def test_single_client_wpa2_personal_2g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_nat_mode[3]['wpa2_personal']['2g'] profile_data = setup_nat_mode[3]['wpa2_personal']['2g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]), debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -99,7 +100,7 @@ class TestNATModeClientConnectivity(object):
def test_single_client_wpa_5g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode, def test_single_client_wpa_5g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_nat_mode[3]['wpa']['5g'] profile_data = setup_nat_mode[3]['wpa']['5g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]), debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -134,7 +135,7 @@ class TestNATModeClientConnectivity(object):
def test_single_client_wpa_2g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode, def test_single_client_wpa_2g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_nat_mode[3]['wpa']['2g'] profile_data = setup_nat_mode[3]['wpa']['2g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]), debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"] staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
@@ -169,7 +170,7 @@ class TestNATModeClientConnectivity(object):
def test_single_client_wpa2_enterprise_5g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode, def test_single_client_wpa2_enterprise_5g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_nat_mode[3]['wpa2_enterprise']['5g'] profile_data = setup_nat_mode[3]['wpa2_enterprise']['5g']
eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080) eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
eap_connect.upstream_resource = 1 eap_connect.upstream_resource = 1
eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"] eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
eap_connect.security = "wpa2" eap_connect.security = "wpa2"
@@ -202,7 +203,7 @@ class TestNATModeClientConnectivity(object):
def test_single_client_wpa2_enterprise_2g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode, def test_single_client_wpa2_enterprise_2g(self, setup_cloudsdk, upgrade_firmware, setup_nat_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_nat_mode[3]['wpa2_enterprise']['2g'] profile_data = setup_nat_mode[3]['wpa2_enterprise']['2g']
eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080) eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
eap_connect.upstream_resource = 1 eap_connect.upstream_resource = 1
eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"] eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
eap_connect.security = "wpa2" eap_connect.security = "wpa2"

View File

@@ -5,6 +5,8 @@ for folder in 'py-json', 'py-scripts':
if folder not in sys.path: if folder not in sys.path:
sys.path.append(f'../lanforge/lanforge-scripts/{folder}') 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')
sys.path.append(f'../libs/lanforge/') sys.path.append(f'../libs/lanforge/')
@@ -19,87 +21,11 @@ import eap_connect
from eap_connect import EAPConnect from eap_connect import EAPConnect
import time import time
@pytest.mark.usefixtures('setup_cloudsdk') @pytest.mark.usefixtures('setup_cloudsdk')
@pytest.mark.usefixtures('upgrade_firmware') @pytest.mark.usefixtures('upgrade_firmware')
class TestVLANModeClientConnectivity(object): class TestVLANModeClientConnectivity(object):
# @pytest.mark.vlan
# @pytest.mark.open
# @pytest.mark.wpa
# @pytest.mark.wpa2
# @pytest.mark.eap
# def test_single_client(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, disconnect_cloudsdk, get_lanforge_data):
# print("Run Client Connectivity Here - VLAN Mode")
# test_result = []
# for profile in setup_vlan_mode[3]:
# print(profile)
# if str(profile["ssid_name"]).__contains__("EAP"):
# eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080)
# eap_connect.upstream_resource = 1
# eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
# eap_connect.security = "wpa2"
# eap_connect.sta_list = [get_lanforge_data["lanforge_5g_station"]]
# eap_connect.station_names = [get_lanforge_data["lanforge_5g_station"]]
# eap_connect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
# eap_connect.ssid = profile["ssid_name"]
# eap_connect.radio = get_lanforge_data["lanforge_5g"]
# eap_connect.eap = "TTLS"
# eap_connect.identity = "nolaradius"
# eap_connect.ttls_passwd = "nolastart"
# eap_connect.runtime_secs = 10
# eap_connect.setup()
# eap_connect.start()
# print("napping %f sec" % eap_connect.runtime_secs)
# time.sleep(eap_connect.runtime_secs)
# eap_connect.stop()
# eap_connect.cleanup()
# run_results = eap_connect.get_result_list()
# for result in run_results:
# print("test result: " + result)
# # result = 'pass'
# print("Single Client Connectivity :", eap_connect.passes)
# if eap_connect.passes() == True:
# test_result.append("PASS")
# else:
# test_result.append("FAIL")
# else:
# # SSID, Passkey, Security, Run layer3 tcp, udp upstream downstream
# staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False)
# staConnect.sta_mode = 0
# staConnect.upstream_resource = 1
# staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
# staConnect.radio = get_lanforge_data["lanforge_5g"]
# staConnect.resource = 1
# staConnect.dut_ssid = profile["ssid_name"]
# staConnect.dut_passwd = profile["security_key"]
# staConnect.dut_security = profile["security_key"].split("-")[1].split("_")[0].lower()
# staConnect.station_names = [get_lanforge_data["lanforge_5g_station"]]
# staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
# staConnect.runtime_secs = 10
# staConnect.bringup_time_sec = 60
# staConnect.cleanup_on_exit = True
# # staConnect.cleanup()
# staConnect.setup()
# staConnect.start()
# print("napping %f sec" % staConnect.runtime_secs)
# time.sleep(staConnect.runtime_secs)
# staConnect.stop()
# staConnect.cleanup()
# run_results = staConnect.get_result_list()
# for result in run_results:
# print("test result: " + result)
# # result = 'pass'
# print("Single Client Connectivity :", staConnect.passes)
# if staConnect.passes() == True:
# test_result.append("PASS")
# else:
# test_result.append("FAIL")
# print(test_result)
# if test_result.__contains__("FAIL"):
# assert False
# else:
# assert True
@pytest.mark.sanity @pytest.mark.sanity
@pytest.mark.vlan @pytest.mark.vlan
@pytest.mark.wpa2_personal @pytest.mark.wpa2_personal
@@ -107,7 +33,8 @@ class TestVLANModeClientConnectivity(object):
def test_single_client_wpa2_personal_5g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, def test_single_client_wpa2_personal_5g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_vlan_mode[3]['wpa2_personal']['5g'] profile_data = setup_vlan_mode[3]['wpa2_personal']['5g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"] staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"]
@@ -142,7 +69,8 @@ class TestVLANModeClientConnectivity(object):
def test_single_client_wpa2_personal_2g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, def test_single_client_wpa2_personal_2g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_vlan_mode[3]['wpa2_personal']['2g'] profile_data = setup_vlan_mode[3]['wpa2_personal']['2g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"] staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"]
@@ -177,7 +105,8 @@ class TestVLANModeClientConnectivity(object):
def test_single_client_wpa_5g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, def test_single_client_wpa_5g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_vlan_mode[3]['wpa']['5g'] profile_data = setup_vlan_mode[3]['wpa']['5g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"] staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"]
@@ -212,7 +141,8 @@ class TestVLANModeClientConnectivity(object):
def test_single_client_wpa_2g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, def test_single_client_wpa_2g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_vlan_mode[3]['wpa']['2g'] profile_data = setup_vlan_mode[3]['wpa']['2g']
staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], 8080, debug_=False) staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
debug_=False)
staConnect.sta_mode = 0 staConnect.sta_mode = 0
staConnect.upstream_resource = 1 staConnect.upstream_resource = 1
staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"] staConnect.upstream_port = get_lanforge_data["lanforge_vlan_port"]
@@ -247,7 +177,7 @@ class TestVLANModeClientConnectivity(object):
def test_single_client_wpa2_enterprise_5g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, def test_single_client_wpa2_enterprise_5g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_vlan_mode[3]['wpa2_enterprise']['5g'] profile_data = setup_vlan_mode[3]['wpa2_enterprise']['5g']
eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080) eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
eap_connect.upstream_resource = 1 eap_connect.upstream_resource = 1
eap_connect.upstream_port = get_lanforge_data["lanforge_vlan_port"] eap_connect.upstream_port = get_lanforge_data["lanforge_vlan_port"]
eap_connect.security = "wpa2" eap_connect.security = "wpa2"
@@ -273,7 +203,6 @@ class TestVLANModeClientConnectivity(object):
print("Single Client Connectivity :", eap_connect.passes) print("Single Client Connectivity :", eap_connect.passes)
assert eap_connect.passes() assert eap_connect.passes()
@pytest.mark.sanity @pytest.mark.sanity
@pytest.mark.vlan @pytest.mark.vlan
@pytest.mark.wpa2_enterprise @pytest.mark.wpa2_enterprise
@@ -281,7 +210,7 @@ class TestVLANModeClientConnectivity(object):
def test_single_client_wpa2_enterprise_2g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode, def test_single_client_wpa2_enterprise_2g(self, setup_cloudsdk, upgrade_firmware, setup_vlan_mode,
disconnect_cloudsdk, get_lanforge_data): disconnect_cloudsdk, get_lanforge_data):
profile_data = setup_vlan_mode[3]['wpa2_enterprise']['2g'] profile_data = setup_vlan_mode[3]['wpa2_enterprise']['2g']
eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], 8080) eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
eap_connect.upstream_resource = 1 eap_connect.upstream_resource = 1
eap_connect.upstream_port = get_lanforge_data["lanforge_vlan_port"] eap_connect.upstream_port = get_lanforge_data["lanforge_vlan_port"]
eap_connect.security = "wpa2" eap_connect.security = "wpa2"
@@ -306,4 +235,3 @@ class TestVLANModeClientConnectivity(object):
# result = 'pass' # result = 'pass'
print("Single Client Connectivity :", eap_connect.passes) print("Single Client Connectivity :", eap_connect.passes)
assert eap_connect.passes() assert eap_connect.passes()

View File

@@ -44,8 +44,13 @@ def pytest_addoption(parser):
parser.addini("lanforge-ip-address", "LANforge ip address to connect to") parser.addini("lanforge-ip-address", "LANforge ip address to connect to")
parser.addini("lanforge-port-number", "LANforge port number to connect to") parser.addini("lanforge-port-number", "LANforge port number to connect to")
parser.addini("lanforge-radio", "LANforge radio to use") parser.addini("lanforge-bridge-port", "LANforge port for bridge mode testing")
parser.addini("lanforge-ethernet-port", "LANforge ethernet adapter to use") parser.addini("lanforge-2dot4g-prefix", "LANforge 2.4g prefix")
parser.addini("lanforge-5g-prefix", "LANforge 5g prefix")
parser.addini("lanforge-2dot4g-station", "LANforge station name for 2.4g")
parser.addini("lanforge-5g-station", "LANforge station name for 5g")
parser.addini("lanforge-2dot4g-radio", "LANforge radio for 2.4g")
parser.addini("lanforge-5g-radio", "LANforge radio for 5g")
parser.addini("jumphost_ip", "APNOS Jumphost IP Address") parser.addini("jumphost_ip", "APNOS Jumphost IP Address")
parser.addini("jumphost_username", "APNOS Jumphost Username") parser.addini("jumphost_username", "APNOS Jumphost Username")
@@ -56,6 +61,10 @@ def pytest_addoption(parser):
parser.addini("skip-wpa", "skip wpa ssid mode") parser.addini("skip-wpa", "skip wpa ssid mode")
parser.addini("skip-wpa2", "skip wpa2 ssid mode") parser.addini("skip-wpa2", "skip wpa2 ssid mode")
parser.addini("skip-eap", "skip eap ssid mode") parser.addini("skip-eap", "skip eap ssid mode")
parser.addini("radius_server_ip", "Radius server IP")
parser.addini("radius_port", "Radius Port")
parser.addini("radius_secret", "Radius shared Secret")
# change behaviour # change behaviour
parser.addoption( parser.addoption(
"--skip-update-firmware", "--skip-update-firmware",
@@ -156,21 +165,20 @@ def setup_cloudsdk(request, instantiate_cloudsdk):
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def upgrade_firmware(request, instantiate_jFrog, instantiate_cloudsdk, retrieve_latest_image, get_equipment_id): def upgrade_firmware(request, instantiate_jFrog, instantiate_cloudsdk, get_equipment_id):
if request.config.getoption("--skip-update-firmware"): if request.config.getoption("--skip-update-firmware"):
obj = FirmwareUtility(jfrog_credentials=instantiate_jFrog, sdk_client=instantiate_cloudsdk) obj = FirmwareUtility(jfrog_credentials=instantiate_jFrog, sdk_client=instantiate_cloudsdk)
status = obj.upgrade_fw(equipment_id=get_equipment_id, force_upload=False, force_upgrade=False) status = obj.upgrade_fw(equipment_id=get_equipment_id, force_upload=False, force_upgrade=False)
time.sleep(60)
else: else:
status = "skip-upgrade" status = "skip-upgrade"
yield status yield status
@pytest.fixture(scope="session") # @pytest.fixture(scope="session")
def retrieve_latest_image(request, access_points): # def retrieve_latest_image(request, access_points):
if request.config.getoption("--skip-update-firmware"): # if request.config.getoption("--skip-update-firmware"):
yield True # yield True
yield True # yield True
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
@@ -239,7 +247,7 @@ def setup_bridge_mode(request, instantiate_cloudsdk, create_bridge_profile, get_
@pytest.fixture(scope="class") @pytest.fixture(scope="class")
def create_bridge_profile(instantiate_cloudsdk, setup_bridge_profile_data, get_testbed_name, get_equipment_id, def create_bridge_profile(request, instantiate_cloudsdk, setup_bridge_profile_data, get_testbed_name, get_equipment_id,
get_equipment_model, get_equipment_model,
get_bridge_testcases): get_bridge_testcases):
print(setup_bridge_profile_data) print(setup_bridge_profile_data)
@@ -250,46 +258,58 @@ def create_bridge_profile(instantiate_cloudsdk, setup_bridge_profile_data, get_t
profile_list = {"open": {"2g": {}, "5g": {}}, "wpa": {"2g": {}, "5g": {}}, "wpa2_personal": {"2g": {}, "5g": {}}, profile_list = {"open": {"2g": {}, "5g": {}}, "wpa": {"2g": {}, "5g": {}}, "wpa2_personal": {"2g": {}, "5g": {}},
"wpa2_enterprise": {"2g": {}, "5g": {}}} "wpa2_enterprise": {"2g": {}, "5g": {}}}
if get_bridge_testcases["open"]: if get_bridge_testcases["open_2g"]:
profile_data = setup_bridge_profile_data['OPEN']['2G'] profile_data = setup_bridge_profile_data['OPEN']['2G']
profile_list["open"]["2g"] = profile_data profile_list["open"]["2g"] = profile_data
profile_object.create_open_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_open_ssid_profile(profile_data=profile_data, fiveg=False)
if get_bridge_testcases["open_5g"]:
profile_data = setup_bridge_profile_data['OPEN']['5G'] profile_data = setup_bridge_profile_data['OPEN']['5G']
profile_list["open"]["5g"] = profile_data profile_list["open"]["5g"] = profile_data
profile_object.create_open_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_open_ssid_profile(profile_data=profile_data, two4g=False)
if get_bridge_testcases["wpa"]: if get_bridge_testcases["wpa_2g"]:
profile_data = setup_bridge_profile_data['WPA']['2G'] profile_data = setup_bridge_profile_data['WPA']['2G']
profile_list["wpa"]["2g"] = profile_data profile_list["wpa"]["2g"] = profile_data
profile_object.create_wpa_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa_ssid_profile(profile_data=profile_data, fiveg=False)
if get_bridge_testcases["wpa_5g"]:
profile_data = setup_bridge_profile_data['WPA']['5G'] profile_data = setup_bridge_profile_data['WPA']['5G']
profile_list["wpa"]["5g"] = profile_data profile_list["wpa"]["5g"] = profile_data
profile_object.create_wpa_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa_ssid_profile(profile_data=profile_data, two4g=False)
if get_bridge_testcases["wpa2_personal"]: if get_bridge_testcases["wpa2_personal_2g"]:
profile_data = setup_bridge_profile_data['WPA2']['2G'] profile_data = setup_bridge_profile_data['WPA2']['2G']
profile_list["wpa2_personal"]["2g"] = profile_data profile_list["wpa2_personal"]["2g"] = profile_data
profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, fiveg=False)
if get_bridge_testcases["wpa2_personal_5g"]:
profile_data = setup_bridge_profile_data['WPA2']['5G'] profile_data = setup_bridge_profile_data['WPA2']['5G']
profile_list["wpa2_personal"]["5g"] = profile_data profile_list["wpa2_personal"]["5g"] = profile_data
profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, two4g=False)
if get_bridge_testcases["wpa2_enterprise"]: if get_bridge_testcases["wpa2_enterprise_2g"] or get_bridge_testcases["wpa2_enterprise_5g"]:
radius_info = { radius_info = {
"name": get_testbed_name + "-RADIUS-Sanity", "name": get_testbed_name + "-RADIUS-Sanity",
"ip": "192.168.200.75", "ip": request.config.getini("radius_server_ip"),
"port": 1812, "port": request.config.getini("radius_port"),
"secret": "testing123" "secret": request.config.getini("radius_secret")
} }
profile_object.create_radius_profile(radius_info=radius_info) profile_object.create_radius_profile(radius_info=radius_info)
if get_bridge_testcases["wpa2_enterprise_2g"]:
profile_data = setup_bridge_profile_data['EAP']['2G'] profile_data = setup_bridge_profile_data['EAP']['2G']
profile_list["wpa2_enterprise"]["2g"] = profile_data profile_list["wpa2_enterprise"]["2g"] = profile_data
profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, fiveg=False)
if get_bridge_testcases["wpa2_enterprise_5g"]:
profile_data = setup_bridge_profile_data['EAP']['5G'] profile_data = setup_bridge_profile_data['EAP']['5G']
profile_list["wpa2_enterprise"]["5g"] = profile_data profile_list["wpa2_enterprise"]["5g"] = profile_data
profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, two4g=False)
@@ -353,8 +373,8 @@ def setup_nat_mode(request, instantiate_cloudsdk, create_nat_profile, get_equipm
@pytest.fixture(scope="class") @pytest.fixture(scope="class")
def create_nat_profile(instantiate_cloudsdk, setup_nat_profile_data, get_testbed_name, get_equipment_id, def create_nat_profile(request, instantiate_cloudsdk, setup_nat_profile_data, get_testbed_name, get_equipment_id,
get_nat_testcases): get_nat_testcases, get_equipment_model):
print(setup_nat_profile_data) print(setup_nat_profile_data)
# SSID and AP name shall be used as testbed_name and mode # SSID and AP name shall be used as testbed_name and mode
profile_object = ProfileUtility(sdk_client=instantiate_cloudsdk) profile_object = ProfileUtility(sdk_client=instantiate_cloudsdk)
@@ -363,46 +383,50 @@ def create_nat_profile(instantiate_cloudsdk, setup_nat_profile_data, get_testbed
profile_list = {"open": {"2g": {}, "5g": {}}, "wpa": {"2g": {}, "5g": {}}, "wpa2_personal": {"2g": {}, "5g": {}}, profile_list = {"open": {"2g": {}, "5g": {}}, "wpa": {"2g": {}, "5g": {}}, "wpa2_personal": {"2g": {}, "5g": {}},
"wpa2_enterprise": {"2g": {}, "5g": {}}} "wpa2_enterprise": {"2g": {}, "5g": {}}}
if get_nat_testcases["open"]: if get_nat_testcases["open_2g"]:
profile_data = setup_nat_profile_data['OPEN']['2G'] profile_data = setup_nat_profile_data['OPEN']['2G']
profile_list["open"]["2g"] = profile_data profile_list["open"]["2g"] = profile_data
profile_object.create_open_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_open_ssid_profile(profile_data=profile_data, fiveg=False)
if get_nat_testcases["open_5g"]:
profile_data = setup_nat_profile_data['OPEN']['5G'] profile_data = setup_nat_profile_data['OPEN']['5G']
profile_list["open"]["5g"] = profile_data profile_list["open"]["5g"] = profile_data
profile_object.create_open_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_open_ssid_profile(profile_data=profile_data, two4g=False)
if get_nat_testcases["wpa"]: if get_nat_testcases["wpa_2g"]:
profile_data = setup_nat_profile_data['WPA']['2G'] profile_data = setup_nat_profile_data['WPA']['2G']
profile_list["wpa"]["2g"] = profile_data profile_list["wpa"]["2g"] = profile_data
profile_object.create_wpa_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa_ssid_profile(profile_data=profile_data, fiveg=False)
if get_nat_testcases["wpa_5g"]:
profile_data = setup_nat_profile_data['WPA']['5G'] profile_data = setup_nat_profile_data['WPA']['5G']
profile_list["wpa"]["5g"] = profile_data profile_list["wpa"]["5g"] = profile_data
profile_object.create_wpa_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa_ssid_profile(profile_data=profile_data, two4g=False)
if get_nat_testcases["wpa2_personal"]: if get_nat_testcases["wpa2_personal_2g"]:
profile_data = setup_nat_profile_data['WPA2']['2G'] profile_data = setup_nat_profile_data['WPA2']['2G']
profile_list["wpa2_personal"]["2g"] = profile_data profile_list["wpa2_personal"]["2g"] = profile_data
profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, fiveg=False)
if get_nat_testcases["wpa2_personal_5g"]:
profile_data = setup_nat_profile_data['WPA2']['5G'] profile_data = setup_nat_profile_data['WPA2']['5G']
profile_list["wpa2_personal"]["5g"] = profile_data profile_list["wpa2_personal"]["5g"] = profile_data
profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, two4g=False)
if get_nat_testcases["wpa2_enterprise"]: if get_nat_testcases["wpa2_enterprise_2g"] or get_nat_testcases["wpa2_enterprise_5g"]:
radius_info = { radius_info = {
"name": get_testbed_name + "-RADIUS-Sanity", "name": get_testbed_name + "-RADIUS-Sanity",
"ip": "192.168.200.75", "ip": request.config.getini("radius_server_ip"),
"port": 1812, "port": request.config.getini("radius_port"),
"secret": "testing123" "secret": request.config.getini("radius_secret")
} }
profile_object.create_radius_profile(radius_info=radius_info) profile_object.create_radius_profile(radius_info=radius_info)
if get_nat_testcases["wpa2_enterprise_2g"]:
profile_data = setup_nat_profile_data['EAP']['2G'] profile_data = setup_nat_profile_data['EAP']['2G']
profile_list["wpa2_enterprise"]["2g"] = profile_data profile_list["wpa2_enterprise"]["2g"] = profile_data
profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, fiveg=False)
if get_nat_testcases["wpa2_enterprise_5g"]:
profile_data = setup_nat_profile_data['EAP']['5G'] profile_data = setup_nat_profile_data['EAP']['5G']
profile_list["wpa2_enterprise"]["5g"] = profile_data profile_list["wpa2_enterprise"]["5g"] = profile_data
profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, two4g=False)
@@ -468,8 +492,8 @@ def setup_vlan_mode(request, instantiate_cloudsdk, create_vlan_profile, get_equi
@pytest.fixture(scope="class") @pytest.fixture(scope="class")
def create_vlan_profile(instantiate_cloudsdk, setup_vlan_profile_data, get_testbed_name, get_equipment_id, def create_vlan_profile(request, instantiate_cloudsdk, setup_vlan_profile_data, get_testbed_name, get_equipment_id,
get_vlan_testcases): get_vlan_testcases, get_equipment_model):
print(setup_vlan_profile_data) print(setup_vlan_profile_data)
# SSID and AP name shall be used as testbed_name and mode # SSID and AP name shall be used as testbed_name and mode
profile_object = ProfileUtility(sdk_client=instantiate_cloudsdk) profile_object = ProfileUtility(sdk_client=instantiate_cloudsdk)
@@ -478,46 +502,50 @@ def create_vlan_profile(instantiate_cloudsdk, setup_vlan_profile_data, get_testb
profile_list = {"open": {"2g": {}, "5g": {}}, "wpa": {"2g": {}, "5g": {}}, "wpa2_personal": {"2g": {}, "5g": {}}, profile_list = {"open": {"2g": {}, "5g": {}}, "wpa": {"2g": {}, "5g": {}}, "wpa2_personal": {"2g": {}, "5g": {}},
"wpa2_enterprise": {"2g": {}, "5g": {}}} "wpa2_enterprise": {"2g": {}, "5g": {}}}
if get_vlan_testcases["open"]: if get_vlan_testcases["open_2g"]:
profile_data = setup_vlan_profile_data['OPEN']['2G'] profile_data = setup_vlan_profile_data['OPEN']['2G']
profile_list["open"]["2g"] = profile_data profile_list["open"]["2g"] = profile_data
profile_object.create_open_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_open_ssid_profile(profile_data=profile_data, fiveg=False)
if get_vlan_testcases["open_5g"]:
profile_data = setup_vlan_profile_data['OPEN']['5G'] profile_data = setup_vlan_profile_data['OPEN']['5G']
profile_list["open"]["5g"] = profile_data profile_list["open"]["5g"] = profile_data
profile_object.create_open_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_open_ssid_profile(profile_data=profile_data, two4g=False)
if get_vlan_testcases["wpa"]: if get_vlan_testcases["wpa_2g"]:
profile_data = setup_vlan_profile_data['WPA']['2G'] profile_data = setup_vlan_profile_data['WPA']['2G']
profile_list["wpa"]["2g"] = profile_data profile_list["wpa"]["2g"] = profile_data
profile_object.create_wpa_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa_ssid_profile(profile_data=profile_data, fiveg=False)
if get_vlan_testcases["wpa_5g"]:
profile_data = setup_vlan_profile_data['WPA']['5G'] profile_data = setup_vlan_profile_data['WPA']['5G']
profile_list["wpa"]["5g"] = profile_data profile_list["wpa"]["5g"] = profile_data
profile_object.create_wpa_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa_ssid_profile(profile_data=profile_data, two4g=False)
if get_vlan_testcases["wpa2_personal"]: if get_vlan_testcases["wpa2_personal_2g"]:
profile_data = setup_vlan_profile_data['WPA2']['2G'] profile_data = setup_vlan_profile_data['WPA2']['2G']
profile_list["wpa2_personal"]["2g"] = profile_data profile_list["wpa2_personal"]["2g"] = profile_data
profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, fiveg=False)
if get_vlan_testcases["wpa2_personal_5g"]:
profile_data = setup_vlan_profile_data['WPA2']['5G'] profile_data = setup_vlan_profile_data['WPA2']['5G']
profile_list["wpa2_personal"]["5g"] = profile_data profile_list["wpa2_personal"]["5g"] = profile_data
profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa2_personal_ssid_profile(profile_data=profile_data, two4g=False)
if get_vlan_testcases["wpa2_enterprise"]: if get_vlan_testcases["wpa2_enterprise_2g"] or get_vlan_testcases["wpa2_enterprise_5g"]:
radius_info = { radius_info = {
"name": get_testbed_name + "-RADIUS-Sanity", "name": get_testbed_name + "-RADIUS-Sanity",
"ip": "192.168.200.75", "ip": request.config.getini("radius_server_ip"),
"port": 1812, "port": request.config.getini("radius_port"),
"secret": "testing123" "secret": request.config.getini("radius_secret")
} }
profile_object.create_radius_profile(radius_info=radius_info) profile_object.create_radius_profile(radius_info=radius_info)
if get_vlan_testcases["wpa2_enterprise_2g"]:
profile_data = setup_vlan_profile_data['EAP']['2G'] profile_data = setup_vlan_profile_data['EAP']['2G']
profile_list["wpa2_enterprise"]["2g"] = profile_data profile_list["wpa2_enterprise"]["2g"] = profile_data
profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, fiveg=False) profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, fiveg=False)
if get_vlan_testcases["wpa2_enterprise_5g"]:
profile_data = setup_vlan_profile_data['EAP']['5G'] profile_data = setup_vlan_profile_data['EAP']['5G']
profile_list["wpa2_enterprise"]["5g"] = profile_data profile_list["wpa2_enterprise"]["5g"] = profile_data
profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, two4g=False) profile_object.create_wpa2_enterprise_ssid_profile(profile_data=profile_data, two4g=False)
@@ -634,14 +662,15 @@ def delete_profiles(sdk_client=None, equipment_id=None):
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def get_lanforge_data(request): def get_lanforge_data(request):
lanforge_data = { lanforge_data = {
"lanforge_ip": "192.168.200.80", "lanforge_ip": request.config.getini("lanforge-ip-address"),
"lanforge_2dot4g": "wiphy1", "lanforge-port-number": request.config.getini("lanforge-port-number"),
"lanforge_5g": "wiphy1", "lanforge_2dot4g": request.config.getini("lanforge-2dot4g-radio"),
"lanforge_2dot4g_prefix": "wlan1", "lanforge_5g": request.config.getini("lanforge-5g-radio"),
"lanforge_5g_prefix": "wlan1", "lanforge_2dot4g_prefix": request.config.getini("lanforge-2dot4g-prefix"),
"lanforge_2dot4g_station": "wlan1", "lanforge_5g_prefix": request.config.getini("lanforge-5g-prefix"),
"lanforge_5g_station": "wlan1", "lanforge_2dot4g_station": request.config.getini("lanforge-2dot4g-station"),
"lanforge_bridge_port": "eth1", "lanforge_5g_station": request.config.getini("lanforge-5g-station"),
"lanforge_bridge_port": request.config.getini("lanforge-bridge-port"),
"lanforge_vlan_port": "eth1.100", "lanforge_vlan_port": "eth1.100",
"vlan": 100 "vlan": 100
} }
@@ -668,83 +697,136 @@ def get_bridge_testcases(request):
# import pdb # import pdb
# pdb.set_trace() # pdb.set_trace()
print("callattr_ahead_of_alltests called") print("callattr_ahead_of_alltests called")
security = {"open": False, security = {"open_2g": False,
"wpa": False, "open_5g": False,
"wpa2_personal": False, "wpa_5g": False,
"wpa2_enterprise": False "wpa_2g": False,
"wpa2_personal_5g": False,
"wpa2_personal_2g": False,
"wpa2_enterprise_5g": False,
"wpa2_enterprise_2g": False
} }
session = request.node session = request.node
for item in session.items: for item in session.items:
for i in item.iter_markers(): for i in item.iter_markers():
if str(i.name).__eq__("wpa"): if str(i.name).__eq__("wpa_2g"):
print(i) print(i)
security["wpa"] = True security["wpa_2g"] = True
pass
if str(i.name).__eq__("wpa2_personal"): if str(i.name).__eq__("wpa_5g"):
print(i) print(i)
security["wpa2_personal"] = True security["wpa_5g"] = True
pass
if str(i.name).__eq__("wpa2_enterprise"): if str(i.name).__eq__("wpa2_personal_5g"):
print(i) print(i)
security["wpa2_enterprise"] = True security["wpa2_personal_5g"] = True
pass
if str(i.name).__eq__("wpa2_personal_2g"):
print(i)
security["wpa2_personal_2g"] = True
if str(i.name).__eq__("wpa2_enterprise_2g"):
print(i)
security["wpa2_enterprise_2g"] = True
if str(i.name).__eq__("wpa2_enterprise_5g"):
print(i)
security["wpa2_enterprise_5g"] = True
yield security yield security
"""
open_2g
open_5g
wpa2_personal_5g
wpa2_personal_2g
wpa_5g
wpa_2g
wpa2_enterprise_5g
wpa2_enterprise_2g
"""
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def get_nat_testcases(request): def get_nat_testcases(request):
# import pdb
# pdb.set_trace()
print("callattr_ahead_of_alltests called") print("callattr_ahead_of_alltests called")
security = {"open": False, security = {"open_2g": False,
"wpa": False, "open_5g": False,
"wpa2_personal": False, "wpa_5g": False,
"wpa2_enterprise": False "wpa_2g": False,
"wpa2_personal_5g": False,
"wpa2_personal_2g": False,
"wpa2_enterprise_5g": False,
"wpa2_enterprise_2g": False
} }
session = request.node session = request.node
for item in session.items: for item in session.items:
for i in item.iter_markers(): for i in item.iter_markers():
if str(i.name).__eq__("wpa"): if str(i.name).__eq__("wpa_2g"):
print(i) print(i)
security["wpa"] = True security["wpa_2g"] = True
pass
if str(i.name).__eq__("wpa2_personal"): if str(i.name).__eq__("wpa_5g"):
print(i) print(i)
security["wpa2_personal"] = True security["wpa_5g"] = True
pass
if str(i.name).__eq__("wpa2_enterprise"): if str(i.name).__eq__("wpa2_personal_5g"):
print(i) print(i)
security["wpa2_enterprise"] = True security["wpa2_personal_5g"] = True
pass
if str(i.name).__eq__("wpa2_personal_2g"):
print(i)
security["wpa2_personal_2g"] = True
if str(i.name).__eq__("wpa2_enterprise_2g"):
print(i)
security["wpa2_enterprise_2g"] = True
if str(i.name).__eq__("wpa2_enterprise_5g"):
print(i)
security["wpa2_enterprise_5g"] = True
yield security yield security
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def get_vlan_testcases(request): def get_vlan_testcases(request):
# import pdb
# pdb.set_trace()
print("callattr_ahead_of_alltests called") print("callattr_ahead_of_alltests called")
security = {"open": False, security = {"open_2g": False,
"wpa": False, "open_5g": False,
"wpa2_personal": False, "wpa_5g": False,
"wpa2_enterprise": False "wpa_2g": False,
"wpa2_personal_5g": False,
"wpa2_personal_2g": False,
"wpa2_enterprise_5g": False,
"wpa2_enterprise_2g": False
} }
session = request.node session = request.node
for item in session.items: for item in session.items:
for i in item.iter_markers(): for i in item.iter_markers():
if str(i.name).__eq__("wpa"): if str(i.name).__eq__("wpa_2g"):
print(i) print(i)
security["wpa"] = True security["wpa_2g"] = True
pass
if str(i.name).__eq__("wpa2_personal"): if str(i.name).__eq__("wpa_5g"):
print(i) print(i)
security["wpa2_personal"] = True security["wpa_5g"] = True
pass
if str(i.name).__eq__("wpa2_enterprise"): if str(i.name).__eq__("wpa2_personal_5g"):
print(i) print(i)
security["wpa2_enterprise"] = True security["wpa2_personal_5g"] = True
pass
if str(i.name).__eq__("wpa2_personal_2g"):
print(i)
security["wpa2_personal_2g"] = True
if str(i.name).__eq__("wpa2_enterprise_2g"):
print(i)
security["wpa2_enterprise_2g"] = True
if str(i.name).__eq__("wpa2_enterprise_5g"):
print(i)
security["wpa2_enterprise_5g"] = True
yield security yield security

View File

@@ -27,8 +27,18 @@ jumphost_password=lanforge
# LANforge # LANforge
lanforge-ip-address=localhost lanforge-ip-address=localhost
lanforge-port-number=8080 lanforge-port-number=8080
lanforge-radio=wiphy4
lanforge-ethernet-port=eth2 lanforge-bridge-port=eth1
lanforge-2dot4g-prefix=wlan1
lanforge-5g-prefix=wlan1
lanforge-2dot4g-station=wlan1
lanforge-5g-station=wlan1
lanforge-2dot4g-radio=wiphy0
lanforge-5g-radio=wiphy1
# Cloud SDK settings # Cloud SDK settings
sdk-customer-id=2 sdk-customer-id=2
@@ -40,16 +50,25 @@ skip-wpa=False
skip-wpa2=False skip-wpa2=False
skip-eap=False skip-eap=False
# Radius Settings
radius_server_ip=192.168.200.75
radius_port=1812
radius_secret=testing123
markers = markers =
sanity: Run the sanity for Client Connectivity test sanity: Run the sanity for Client Connectivity test
bridge bridge
nat nat
vlan vlan
open
wpa wpa
wpa2 wpa_2g
eap wpa_5g
wpa2_personal
wpa2_enterprise
wpa2_personal_2g
wpa2_enterprise_2g
wpa2_personal_5g
wpa2_enterprise_5g
cloud cloud
bearer bearer
ping ping