From 0444a4f2ddf9ba69de74af8c35b3c397db82db1b Mon Sep 17 00:00:00 2001 From: Gokul Singaraju Date: Wed, 13 Jun 2018 16:32:20 -0400 Subject: Add json exception and VNF name Issue-ID: DCAEGEN2-279 Change-Id: I3f78eb87ce4c6eaa30efa8d2efa1e3f187b4e7a7 Signed-off-by: Gokul Singaraju --- miss_htbt_service/htbtworker.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) mode change 100644 => 100755 miss_htbt_service/htbtworker.py diff --git a/miss_htbt_service/htbtworker.py b/miss_htbt_service/htbtworker.py old mode 100644 new mode 100755 index 347dbd6..6123386 --- a/miss_htbt_service/htbtworker.py +++ b/miss_htbt_service/htbtworker.py @@ -85,13 +85,18 @@ def periodic_event(): # Process the DMaaP input message retreived for line in jlist: print("Line:"+line) - jobj = json.loads(line) + try: + jobj = json.loads(line) + except ValueError: + print('Decoding JSON has failed') + continue #print(jobj) - if( nfc != jobj['event']['commonEventHeader']['nfNamingCode']) : - continue srcid = (jobj['event']['commonEventHeader']['sourceId']) lastepo = (jobj['event']['commonEventHeader']['lastEpochMicrosec']) seqnum = (jobj['event']['commonEventHeader']['sequence']) + nfcode = (jobj['event']['commonEventHeader']['nfNamingCode']) + if( nfcode and nfc != nfcode): + continue if( srcid in hearttrack ): tdiff = lastepo - hearttrack[srcid] sdiff = seqnum - heartstate[srcid] @@ -197,6 +202,7 @@ def main(args): cl_loop = args[7] print ("Message router url %s " % mr_url) print ("Policy router url %s " % pol_url) + print ("VNF %s " % nfc) print ("Interval %s " % intvl) if( cl_loop != "internal_test") : #intvl = 60 # every second -- cgit 1.2.3-korg