updated to uses time_offset as a timestamp

Author: David Linko

anms-core/anms/components/schemas/ARIs/rpt_entry.py

@@ -36,7 +36,7 @@ class Config:
     reference_time: Optional[datetime] = None 
     mgr_time: Optional[datetime] = None 
     nonce_cbor: Optional[str] = None
-    time_offset: Optional[str] = None
+    time_offset: Optional[datetime] = None
     report_source: Optional[str] = None
     report_items: Optional[list] = None
     report_item_indexes: Optional[list] = None

anms-core/anms/models/relational/report.py

@@ -43,15 +43,14 @@ class Report(Model):
     agent_id	    = Column(Integer)
     ari_rptset_cbor	= Column(LargeBinary)
     ari_rptlist_id	= Column(Integer)
-    time_offset	    = Column(LargeBinary)
+    time_offset	    = Column(DateTime)
     report_source	= Column(LargeBinary)
     report_items	= Column(ARRAY(LargeBinary) )#bytea[] NULL	
     report_item_indexes	= Column(ARRAY(Integer))
     # processing the raw cbor into an ari object
     @orm.reconstructor
     def init_on_load(self):
         self.nonce_cbor =  TRANSMORGIFIER.transcode("0x"+getattr(self, 'nonce_cbor').hex())['uri']        
-        self.time_offset =  TRANSMORGIFIER.transcode("0x"+getattr(self, 'time_offset').hex())['uri']        
         self.report_source =  TRANSMORGIFIER.transcode("0x"+getattr(self, 'report_source').hex())['uri']
         self.report_items =  [TRANSMORGIFIER.transcode("0x"+x.hex())['uri'] for x in getattr(self, 'report_items')]
 
@@ -65,6 +64,7 @@ def as_dict(self) -> Dict[str, Any]:
                     'nonce_cbor': getattr(self, 'nonce_cbor'),
                     'agent_id': getattr(self, 'agent_id'),       
                     'ari_rptlist_id': getattr(self, 'ari_rptlist_id'),
+                    'time_offset': getattr(self, 'time_offset'),
                     'report_source': getattr(self, 'report_source'),
                     'report_items': getattr(self, 'report_items'),
                     'report_item_indexes': getattr(self, 'report_item_indexes')

deps/dtnma-tools

@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 0,
+  "id": 1,
   "links": [],
   "panels": [
     {
@@ -481,7 +481,7 @@
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "-- all reports \nSELECT \n    reference_time,\n    mgr_time,\n    agent_id, \n    encode(time_offset,'hex') as time_offset,\n    encode(report_source,'hex') as report_source,\n    report_items\nFROM\n    vw_ari_rpt_set",
+          "rawSql": "-- all reports \nSELECT \n    reference_time,\n    mgr_time,\n    agent_id, \n    time_offset,\n    encode(report_source,'hex') as report_source,\n    report_items\nFROM\n    vw_ari_rpt_set",
           "refId": "A",
           "select": [
             [
@@ -823,6 +823,6 @@
   "timepicker": {},
   "timezone": "",
   "title": "Monitor Page",
-  "uid": "mwvijjmvk2",
-  "version": 8
+  "uid": "mwvijjmvk",
+  "version": 2
 }