resolved merge issues with staging-wifi-1960

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-05-15 02:09:17 +05:30
35 changed files with 1685 additions and 544 deletions

View File

@@ -1,11 +1,9 @@
"""
Test Case Module: Testing Basic Connectivity with Resources
Mode: BRIDGE
"""
import pytest
import sys
<<<<<<< HEAD
pytestmark = [pytest.mark.test_connectivity]
@@ -51,3 +49,49 @@ def test_access_points_connectivity(access_point_connectivity, instantiate_testr
@pytest.mark.test_lanforge_connectivity
def test_lanforge_connectiity(check_lanforge_connectivity):
assert True
=======
import allure
import pytest
pytestmark = [pytest.mark.test_resources]
@pytest.mark.sanity
@allure.testcase(name="Test Resources", url="")
class TestResources(object):
@pytest.mark.test_cloud_controller
@allure.testcase(name="test_controller_connectivity", url="")
def test_controller_connectivity(self, setup_controller, update_report, test_cases):
if setup_controller.bearer:
allure.attach(name="Controller Connectivity Success", body="")
update_report.update_testrail(case_id=test_cases["cloud_ver"],
status_id=1, msg='Read CloudSDK version from API successfully')
else:
allure.attach(name="Controller Connectivity Failed", body="")
update_report.update_testrail(case_id=test_cases["cloud_ver"],
status_id=0, msg='Could not read CloudSDK version from API')
pytest.exit("Resource Not Available")
print(setup_controller.bearer)
assert setup_controller.bearer
@pytest.mark.test_access_points_connectivity
@allure.testcase(name="test_access_points_connectivity", url="")
def test_access_points_connectivity(self, test_access_point, update_report, test_cases):
print(test_access_point)
# if "ACTIVE" not in test_access_point:
# allure.attach(name="Access Point Connectivity Success", body=str(test_access_point))
# update_report.update_testrail(case_id=test_cases["cloud_connection"],
# status_id=5,
# msg='CloudSDK connectivity failed')
#
# sys.exit()
# else:
# allure.attach(name="Access Point Connectivity Failed", body=str(test_access_point))
# update_report.update_testrail(case_id=test_cases["cloud_connection"],
# status_id=1,
# msg='Manager status is Active')
#
# assert "ACTIVE" in test_access_point
assert True
>>>>>>> staging-wifi-1960