commit 377d1dab968a185987a0e4e899fb86486e8f276d
author Vijaykumar Kushwaha <vijaykumar_k09@infosys.com> Wed Mar 20 10:29:42 2019 +0530
committer Vijaykumar Kushwaha <vijaykumar_k09@infosys.com> Thu Apr 04 17:45:46 2019 +0530
tree 40446e575e55eb5022a23fac9df28dc4bd8d2d58
parent 0e899c99f6630697c3d024438e0e249234d71dcd

[SEBA-367] olt,onu synchronization fix

Change-Id: If7a5709537bda3b634e8aa1f710ce619886e26f7

xos/synchronizer/pull_steps/pull_olts.py

diff --git a/xos/synchronizer/pull_steps/pull_olts.py b/xos/synchronizer/pull_steps/pull_olts.py
index d44f4ce..33e89fb 100644
--- a/xos/synchronizer/pull_steps/pull_olts.py
+++ b/xos/synchronizer/pull_steps/pull_olts.py
@@ -74,16 +74,22 @@
             if r.status_code != 200:
                 log.debug("[OLT pull step] It was not possible to fetch devices from VOLTHA")
 
-            # keeping only OLTs
-            devices = [d for d in r.json()["items"] if "olt" in d["type"]]
+            # [SEBA-367] Handling blank response received from Voltha, Scenario occurs when voltha api is called while vcore service is re-starting
+            elif r.text:
+                # keeping only OLTs
+                devices = [d for d in r.json()["items"] if "olt" in d["type"]]
 
-            log.debug("[OLT pull step] received devices", olts=devices)
+                log.debug("[OLT pull step] received devices", olts=devices)
 
-            olts_in_voltha = self.create_or_update_olts(devices)
+                olts_in_voltha = self.create_or_update_olts(devices)
 
-            self.delete_olts(olts_in_voltha)
+                self.delete_olts(olts_in_voltha)
+            else:
+                log.debug("[OLT pull step] Blank response received")
 
-
+        except (ValueError, TypeError), e:
+            log.warn("[OLT pull step] Invalid Json received in response from VOLTHA", reason=e)
+            return
         except ConnectionError, e:
             log.warn("[OLT pull step] It was not possible to connect to VOLTHA", reason=e)
             return