- checking if AP is pointing to expected SDK

- wait for AP to be in active state after firmware upgrade

Signed-off-by: Sushant Bawiskar <sushant.bawiskar@candelatech.com>

tests/fixtures_2x.py

@@ -323,12 +323,12 @@ class Fixtures_2x:
         redirector_data = None
         for access_point_info in get_configuration['access_point']:
             ap_ssh = get_apnos(access_point_info, sdk="2.x")
-            for i in range(10):
+            for i in range(15):
                 connectivity_data = ap_ssh.run_generic_command(cmd="ubus call ucentral status")
                 if "disconnected" in str(connectivity_data):
                     print("AP in disconnected state, sleeping for 30 sec")
                     time.sleep(30)
-                    if i == 5:
+                    if i == 10:
                         print("rebooting AP")
                         ap_ssh.reboot()
                         print("sleep for 300 sec")

tests/test_connectivity.py

@@ -223,9 +223,12 @@ class TestFMS(object):
         assert False not in PASS
 
     @pytest.mark.firmware_upgrade
-    def test_firmware_upgrade_request(self, firmware_upgrade, get_ap_logs):
+    def test_firmware_upgrade_request(self, firmware_upgrade, get_ap_logs, test_ap_connection_status):
         for update in firmware_upgrade:
             allure.attach(name='serial: ' + update[0], body="")
+        if test_ap_connection_status[0] == 0:
+            assert False
+            pytest.exit("AP in Disconnected State")
         assert True
 
     @pytest.mark.test_firmware_ap