Merge "Adding broadview events to monitoring dashboard"
diff --git a/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py b/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py
index bf8bef1..1333d5a 100644
--- a/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py
+++ b/xos/api/tenant/monitoring/dashboard/ceilometerdashboard.py
@@ -1141,6 +1141,21 @@
'label': '',
'description': _("Existence of BST device"),
}),
+ ('broadview.pt.packet-trace-lag-resolution', {
+ 'type': _("BROADVIEW"),
+ 'label': '',
+ 'description': _("Existence of BST device"),
+ }),
+ ('broadview.pt.packet-trace-ecmp-resolution', {
+ 'type': _("BROADVIEW"),
+ 'label': '',
+ 'description': _("Existence of BST device"),
+ }),
+ ('broadview.pt.packet-trace-profile', {
+ 'type': _("BROADVIEW"),
+ 'label': '',
+ 'description': _("Existence of BST device"),
+ }),
])
def make_query(user_id=None, tenant_id=None, resource_id=None,
diff --git a/xos/synchronizer/ceilometer/broadview_collector_plugin/serializers/pt_to_ceilometer.py b/xos/synchronizer/ceilometer/broadview_collector_plugin/serializers/pt_to_ceilometer.py
index 0539a7c..e4bd245 100644
--- a/xos/synchronizer/ceilometer/broadview_collector_plugin/serializers/pt_to_ceilometer.py
+++ b/xos/synchronizer/ceilometer/broadview_collector_plugin/serializers/pt_to_ceilometer.py
@@ -15,11 +15,11 @@
from broadviewserializerbase import BroadViewSerializerBase
from broadview_lib.pt.pt_parser import PTParser, ReportTypes
import json
-import six
-import uuid
import unittest
import datetime
import time
+import six
+import uuid
class PTToCeilometer(BroadViewSerializerBase):
@@ -38,7 +38,8 @@
#except:
# timestamp = int(time.mktime(datetime.datetime.utcnow().timetuple())) \
# * 1000 * 1000
- timestamp=time.strftime('%Y-%m-%dT%H:%M:%SZ',data.getTimestamp())
+ #timestamp=time.strftime('%Y-%m-%dT%H:%M:%SZ',data.getTimestamp())
+ timestamp=datetime.datetime.now().isoformat()
asic = data.getASICId()
'''