Merge "[SEBA-532] Removing dependencies on aaa, olt and dhcpl2realy from kafka"
diff --git a/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java
index da6b4a3..8dddb78 100644
--- a/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/AccessDeviceKafkaIntegration.java
@@ -56,9 +56,9 @@
// event fields
private static final String STATUS = "status";
- private static final String SERIAL_NUMBER = "serial_number";
- private static final String UNI_PORT_ID = "uni_port_id";
- private static final String OF_DPID = "of_dpid";
+ private static final String SERIAL_NUMBER = "serialNumber";
+ private static final String PORT_NUMBER = "portNumber"; // uni port
+ private static final String DEVICE_ID = "deviceId"; // OLT OpenFlow Id
private static final String TIMESTAMP = "timestamp";
// statuses
@@ -110,8 +110,8 @@
onuNode.put(TIMESTAMP, Instant.now().toString());
onuNode.put(STATUS, status);
onuNode.put(SERIAL_NUMBER, serialNumber);
- onuNode.put(UNI_PORT_ID, port.number().toLong());
- onuNode.put(OF_DPID, port.element().id().toString());
+ onuNode.put(PORT_NUMBER, port.number().toString());
+ onuNode.put(DEVICE_ID, port.element().id().toString());
return onuNode;
}