SEBA-599 Kafka topic exporter port_id

This is a rebase and squash of patchsets 16737 and 16566

Change-Id: I772e3da35d6d2fd87d5b1d2b307cd08ddf69153e
diff --git a/types.go b/types.go
index 657cf70..ab4360b 100644
--- a/types.go
+++ b/types.go
@@ -112,7 +112,7 @@
 }
 
 type ImporterKPI struct {
-	Timestamp        int64
+	PortId           string
 	LaserBiasCurrent float64
 	Temperature      float64
 	TxPower          float64
@@ -150,15 +150,14 @@
 	RxResIdEapFrames      float64 `json:"resIdEapFramesRx"`
 }
 
-
 type OnosBngKPI struct {
-	Mac             string  `json:"macAddress"`
-	Ip              string  `json:"ipAddress"`
-	PppoeSessionId  int     `json:"pppoeSessionId"`
-	AttachmentType  string  `json:"attachmentType"`
-	STag            int     `json:"sTag"`
-	CTag            int     `json:"cTag"`
-	OnuSerialNumber string  `json:"onuSerialNumber"`
+	Mac             string   `json:"macAddress"`
+	Ip              string   `json:"ipAddress"`
+	PppoeSessionId  int      `json:"pppoeSessionId"`
+	AttachmentType  string   `json:"attachmentType"`
+	STag            int      `json:"sTag"`
+	CTag            int      `json:"cTag"`
+	OnuSerialNumber string   `json:"onuSerialNumber"`
 	DeviceId        string   `json:"deviceId"`
 	PortNumber      string   `json:"portNumber"`
 	UpTxBytes       *float64 `json:"upTxBytes,omitempty"`
@@ -174,5 +173,5 @@
 	DownDropBytes   *float64 `json:"downDropBytes,omitempty"`
 	DownDropPackets *float64 `json:"downDropPackets,omitempty"`
 	ControlPackets  *float64 `json:"controlPackets,omitempty"`
-	Timestamp       string  `json:"timestamp"`
+	Timestamp       string   `json:"timestamp"`
 }