some fixes related to libs and basic test fixtures

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-04-30 19:31:07 +05:30
parent 8d8449177c
commit e21c57a796
10 changed files with 99 additions and 66 deletions

View File

@@ -163,6 +163,3 @@ class APNOS:
print(e)
status = "Error"
return status

View File

@@ -109,6 +109,28 @@ class Controller(ConfigureController):
}
return self.login_client.get_access_token(request_body)
def refresh_instance(self):
# Connecting to Controller
self.api_client = swagger_client.ApiClient(self.configuration)
self.login_client = swagger_client.LoginApi(api_client=self.api_client)
self.bearer = self.get_bearer_token()
self.api_client.default_headers['Authorization'] = "Bearer " + self.bearer._access_token
self.status_client = swagger_client.StatusApi(api_client=self.api_client)
self.equipment_client = swagger_client.EquipmentApi(self.api_client)
self.profile_client = swagger_client.ProfileApi(self.api_client)
self.api_client.configuration.api_key_prefix = {
"Authorization": "Bearer " + self.bearer._access_token
}
self.api_client.configuration.refresh_api_key_hook = self.get_bearer_token()
self.ping_response = self.portal_ping()
self.default_profiles = {}
# print(self.bearer)
if self.ping_response._application_name != 'PortalServer':
print("Server not Reachable")
exit()
print("Connected to Controller Server")
def portal_ping(self):
return self.login_client.portal_ping()
@@ -835,15 +857,3 @@ class FirmwareUtility(JFrogUtility):
firmware_version = False
print("firmware not available: ", firmware_version)
return firmware_version
# data = {
# 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller
# 'username': 'support@example.com',
# 'password': 'support',
# 'version': '1.0.0-SNAPSHOT',
# 'commit_date': '2021-03-01'
# }
# sdk_client = Controller(controller_data=data)
# profile = ProfileUtility(sdk_client=sdk_client)
# profile.cleanup_profiles()
# sdk_client.disconnect_Controller()

View File

@@ -3,6 +3,8 @@
Details: bridge mode setup
"""
import time
import pytest
@@ -162,9 +164,11 @@ class TestSetupBridge:
instantiate_testrail.update_testrail(case_id=test_cases["bridge_vifs"], run_id=instantiate_project,
status_id=1,
msg='profile pushed successfully')
time.sleep(100)
assert setup_profiles['bridge_vifs']
else:
instantiate_testrail.update_testrail(case_id=test_cases["bridge_vifs"], run_id=instantiate_project,
status_id=5,
msg='Failed to push profile')
time.sleep(100)
assert False

View File

@@ -3,6 +3,7 @@
Details: nat mode setup
"""
import time
import pytest
@@ -163,9 +164,11 @@ class TestSetupnat:
instantiate_testrail.update_testrail(case_id=test_cases["nat_vifs"], run_id=instantiate_project,
status_id=1,
msg='profile pushed successfully')
time.sleep(100)
assert setup_profiles['nat_vifs']
else:
instantiate_testrail.update_testrail(case_id=test_cases["nat_vifs"], run_id=instantiate_project,
status_id=5,
msg='Failed to push profile')
time.sleep(100)
assert False

View File

@@ -3,6 +3,7 @@
Details: vlan mode setup
"""
import time
import pytest
@@ -164,9 +165,13 @@ class TestSetupvlan:
instantiate_testrail.update_testrail(case_id=test_cases["vlan_vifs"], run_id=instantiate_project,
status_id=1,
msg='profile pushed successfully')
time.sleep(100)
assert setup_profiles['vlan_vifs']
else:
instantiate_testrail.update_testrail(case_id=test_cases["vlan_vifs"], run_id=instantiate_project,
status_id=5,
msg='Failed to push profile')
time.sleep(100)
assert False

View File

@@ -84,11 +84,11 @@ class TestBridgeModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa_bridge"], run_id=instantiate_project,
status_id=1,
msg='2G WPA Client Connectivity Passed successfully - bridge mode')
msg='2G WPA Client Connectivity Passed successfully - bridge mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa_bridge"], run_id=instantiate_project,
status_id=5,
msg='2G WPA Client Connectivity Failed - bridge mode')
msg='2G WPA Client Connectivity Failed - bridge mode' + str(run_results))
assert staConnect.passes()
# C2420
@@ -130,11 +130,11 @@ class TestBridgeModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa_bridge"], run_id=instantiate_project,
status_id=1,
msg='5G WPA Client Connectivity Passed successfully - bridge mode')
msg='5G WPA Client Connectivity Passed successfully - bridge mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa_bridge"], run_id=instantiate_project,
status_id=5,
msg='5G WPA Client Connectivity Failed - bridge mode')
msg='5G WPA Client Connectivity Failed - bridge mode' + str(run_results))
assert staConnect.passes()
# C2419
@@ -176,11 +176,11 @@ class TestBridgeModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa2_bridge"], run_id=instantiate_project,
status_id=1,
msg='2G WPA2 Client Connectivity Passed successfully - bridge mode')
msg='2G WPA2 Client Connectivity Passed successfully - bridge mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa2_bridge"], run_id=instantiate_project,
status_id=5,
msg='2G WPA2 Client Connectivity Failed - bridge mode')
msg='2G WPA2 Client Connectivity Failed - bridge mode' + str(run_results))
assert staConnect.passes()
# C2237
@@ -222,11 +222,11 @@ class TestBridgeModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa2_bridge"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 Client Connectivity Passed successfully - bridge mode')
msg='5G WPA2 Client Connectivity Passed successfully - bridge mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa2_bridge"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 Client Connectivity Failed - bridge mode')
msg='5G WPA2 Client Connectivity Failed - bridge mode' + str(run_results))
assert staConnect.passes()
# C2236
@@ -271,11 +271,11 @@ class TestBridgeModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["2g_eap_bridge"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
'bridge mode')
'bridge mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_eap_bridge"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode')
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode' + str(run_results))
assert eap_connect.passes()
# C5214
@@ -320,11 +320,11 @@ class TestBridgeModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["5g_eap_bridge"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
'bridge mode')
'bridge mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_eap_bridge"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode')
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode' + str(run_results))
assert eap_connect.passes()
@pytest.mark.modify_ssid
@@ -334,7 +334,7 @@ class TestBridgeModeClientConnectivity(object):
indirect=True
)
def test_modify_ssid(self, request, update_ssid, get_lanforge_data, setup_profile_data, instantiate_testrail,
instantiate_project, test_cases):
instantiate_project, test_cases, instantiate_controller):
profile_data = setup_profile_data["BRIDGE"]["WPA"]["5G"]
station_names = []
for i in range(0, int(request.config.getini("num_stations"))):
@@ -370,9 +370,10 @@ class TestBridgeModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["bridge_ssid_update"], run_id=instantiate_project,
status_id=1,
msg='5G WPA Client Connectivity Passed successfully - bridge mode '
'updated ssid')
'updated ssid' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["bridge_ssid_update"], run_id=instantiate_project,
status_id=5,
msg='5G WPA Client Connectivity Failed - bridge mode updated ssid')
msg='5G WPA Client Connectivity Failed - bridge mode updated ssid' + str(run_results))
instantiate_controller.refresh_instance()
assert staConnect.passes()

View File

@@ -83,11 +83,11 @@ class TestNatModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa_nat"], run_id=instantiate_project,
status_id=1,
msg='2G WPA Client Connectivity Passed successfully - nat mode')
msg='2G WPA Client Connectivity Passed successfully - nat mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa_nat"], run_id=instantiate_project,
status_id=5,
msg='2G WPA Client Connectivity Failed - nat mode')
msg='2G WPA Client Connectivity Failed - nat mode' + str(run_results))
assert staConnect.passes()
# C2420
@@ -129,11 +129,11 @@ class TestNatModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa_nat"], run_id=instantiate_project,
status_id=1,
msg='5G WPA Client Connectivity Passed successfully - nat mode')
msg='5G WPA Client Connectivity Passed successfully - nat mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa_nat"], run_id=instantiate_project,
status_id=5,
msg='5G WPA Client Connectivity Failed - nat mode')
msg='5G WPA Client Connectivity Failed - nat mode' + str(run_results))
assert staConnect.passes()
# C2419
@@ -175,11 +175,11 @@ class TestNatModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa2_nat"], run_id=instantiate_project,
status_id=1,
msg='2G WPA2 Client Connectivity Passed successfully - nat mode')
msg='2G WPA2 Client Connectivity Passed successfully - nat mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa2_nat"], run_id=instantiate_project,
status_id=5,
msg='2G WPA2 Client Connectivity Failed - nat mode')
msg='2G WPA2 Client Connectivity Failed - nat mode' + str(run_results))
assert staConnect.passes()
# C2237
@@ -221,11 +221,11 @@ class TestNatModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa2_nat"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 Client Connectivity Passed successfully - nat mode')
msg='5G WPA2 Client Connectivity Passed successfully - nat mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa2_nat"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 Client Connectivity Failed - nat mode')
msg='5G WPA2 Client Connectivity Failed - nat mode' + str(run_results))
assert staConnect.passes()
# C2236
@@ -270,11 +270,11 @@ class TestNatModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["2g_eap_nat"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
'nat mode')
'nat mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_eap_nat"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - nat mode')
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - nat mode' + str(run_results))
assert eap_connect.passes()
# C5214
@@ -319,11 +319,11 @@ class TestNatModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["5g_eap_nat"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
'nat mode')
'nat mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_eap_nat"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - nat mode')
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - nat mode' + str(run_results))
assert eap_connect.passes()
@pytest.mark.modify_ssid
@@ -333,7 +333,7 @@ class TestNatModeClientConnectivity(object):
indirect=True
)
def test_modify_ssid(self, request, update_ssid, get_lanforge_data, setup_profile_data, instantiate_testrail,
instantiate_project, test_cases):
instantiate_project, test_cases, instantiate_controller):
profile_data = setup_profile_data["NAT"]["WPA"]["5G"]
station_names = []
for i in range(0, int(request.config.getini("num_stations"))):
@@ -369,9 +369,10 @@ class TestNatModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["nat_ssid_update"], run_id=instantiate_project,
status_id=1,
msg='5G WPA Client Connectivity Passed successfully - nat mode '
'updated ssid')
'updated ssid' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["nat_ssid_update"], run_id=instantiate_project,
status_id=5,
msg='5G WPA Client Connectivity Failed - nat mode updated ssid')
msg='5G WPA Client Connectivity Failed - nat mode updated ssid' + str(run_results))
instantiate_controller.refresh_instance()
assert staConnect.passes()

View File

@@ -81,11 +81,11 @@ class TestVlanModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa_vlan"], run_id=instantiate_project,
status_id=1,
msg='2G WPA Client Connectivity Passed successfully - vlan mode')
msg='2G WPA Client Connectivity Passed successfully - vlan mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa_vlan"], run_id=instantiate_project,
status_id=5,
msg='2G WPA Client Connectivity Failed - vlan mode')
msg='2G WPA Client Connectivity Failed - vlan mode' + str(run_results))
assert staConnect.passes()
# C2420
@@ -127,11 +127,11 @@ class TestVlanModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa_vlan"], run_id=instantiate_project,
status_id=1,
msg='5G WPA Client Connectivity Passed successfully - vlan mode')
msg='5G WPA Client Connectivity Passed successfully - vlan mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa_vlan"], run_id=instantiate_project,
status_id=5,
msg='5G WPA Client Connectivity Failed - vlan mode')
msg='5G WPA Client Connectivity Failed - vlan mode' + str(run_results))
assert staConnect.passes()
# C2419
@@ -173,11 +173,11 @@ class TestVlanModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa2_vlan"], run_id=instantiate_project,
status_id=1,
msg='2G WPA2 Client Connectivity Passed successfully - vlan mode')
msg='2G WPA2 Client Connectivity Passed successfully - vlan mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_wpa2_vlan"], run_id=instantiate_project,
status_id=5,
msg='2G WPA2 Client Connectivity Failed - vlan mode')
msg='2G WPA2 Client Connectivity Failed - vlan mode' + str(run_results))
assert staConnect.passes()
# C2237
@@ -219,11 +219,11 @@ class TestVlanModeClientConnectivity(object):
if staConnect.passes():
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa2_vlan"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 Client Connectivity Passed successfully - vlan mode')
msg='5G WPA2 Client Connectivity Passed successfully - vlan mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_wpa2_vlan"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 Client Connectivity Failed - vlan mode')
msg='5G WPA2 Client Connectivity Failed - vlan mode' + str(run_results))
assert staConnect.passes()
# C2236
@@ -268,11 +268,11 @@ class TestVlanModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["2g_eap_vlan"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
'vlan mode')
'vlan mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["2g_eap_vlan"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - vlan mode')
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - vlan mode' + str(run_results))
assert eap_connect.passes()
# C5214
@@ -317,11 +317,11 @@ class TestVlanModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["5g_eap_vlan"], run_id=instantiate_project,
status_id=1,
msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
'vlan mode')
'vlan mode' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["5g_eap_vlan"], run_id=instantiate_project,
status_id=5,
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - vlan mode')
msg='5G WPA2 ENTERPRISE Client Connectivity Failed - vlan mode' + str(run_results))
assert eap_connect.passes()
@pytest.mark.modify_ssid
@@ -331,7 +331,7 @@ class TestVlanModeClientConnectivity(object):
indirect=True
)
def test_modify_ssid(self, request, update_ssid, get_lanforge_data, setup_profile_data, instantiate_testrail,
instantiate_project, test_cases):
instantiate_project, test_cases, instantiate_controller):
profile_data = setup_profile_data["VLAN"]["WPA"]["5G"]
station_names = []
for i in range(0, int(request.config.getini("num_stations"))):
@@ -367,9 +367,10 @@ class TestVlanModeClientConnectivity(object):
instantiate_testrail.update_testrail(case_id=test_cases["vlan_ssid_update"], run_id=instantiate_project,
status_id=1,
msg='5G WPA Client Connectivity Passed successfully - vlan mode '
'updated ssid')
'updated ssid' + str(run_results))
else:
instantiate_testrail.update_testrail(case_id=test_cases["vlan_ssid_update"], run_id=instantiate_project,
status_id=5,
msg='5G WPA Client Connectivity Failed - vlan mode updated ssid')
msg='5G WPA Client Connectivity Failed - vlan mode updated ssid' + str(run_results))
instantiate_controller.refresh_instance()
assert staConnect.passes()

View File

@@ -144,7 +144,7 @@ def setup_profiles(request, create_profiles, instantiate_profile, get_equipment_
instantiate_profile.push_profile_old_method(equipment_id=get_equipment_id)
except:
print("failed to create AP Profile")
ap_ssh = APNOS(CONFIGURATION[testbed]['access_point'][0])
ap_ssh = APNOS(CONFIGURATION[testbed]['access_point'][0], pwd="../libs/apnos/")
get_current_profile_cloud.sort()
# This loop will check the VIF Config with cloud profile
for i in range(0, 18):
@@ -156,7 +156,7 @@ def setup_profiles(request, create_profiles, instantiate_profile, get_equipment_
test_cases[mode + '_vifc'] = True
break
time.sleep(10)
ap_ssh = APNOS(CONFIGURATION[testbed]['access_point'][0])
ap_ssh = APNOS(CONFIGURATION[testbed]['access_point'][0], pwd="../libs/apnos/")
# This loop will check the VIF Config with VIF State
for i in range(0, 18):
vif_state = list(ap_ssh.get_vif_state_ssids())
@@ -280,6 +280,8 @@ def create_profiles(request, testbed, get_security_flags, get_markers, instantia
except:
test_cases['ssid_5g_eap_' + mode.lower()] = False
# Create Equipment AP Profile Here
profile_data = {
"profile_name": testbed + "-Equipment-AP-" + mode

View File

@@ -6,14 +6,23 @@ import pytest
@pytest.mark.wifi5
@pytest.mark.wifi6
@pytest.mark.parametrize(
'setup_profiles',
(["BRIDGE"]),
indirect=True
'setup_profiles, create_profiles',
[(["NAT"], ["NAT"])],
indirect=True,
scope="class"
)
@pytest.mark.usefixtures("setup_profiles")
@pytest.mark.usefixtures("create_profiles")
class TestBridgeModeClientConnectivity(object):
@pytest.mark.wpa
@pytest.mark.twog
def test_client_wpa_2g(self, request, get_lanforge_data, setup_profile_data):
@pytest.mark.fiveg
def test_client_wpa_2g(self, get_lanforge_data, setup_profile_data):
assert True
@pytest.mark.wpa
@pytest.mark.twog
@pytest.mark.fiveg
def test_client_wpa_2g(self, get_lanforge_data, setup_profile_data):
assert True