[VOL-2778] Tracking multiple DHCP allocation per Subscriber
Change-Id: Ib0b60b0fa20661b9dbb58739b0cb31e79b11485f
diff --git a/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java b/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java
index 7d08737..891e4fb 100644
--- a/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java
+++ b/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java
@@ -34,8 +34,8 @@
service.getAllocationInfo().forEach((key, value) -> {
print("SubscriberId=%s,ConnectPoint=%s,State=%s,MAC=%s,CircuitId=%s" +
",IP Allocated=%s,Allocation Timestamp=%s",
- key, value.location(), value.type(), value.macAddress().toString(), value.circuitId(),
- value.ipAddress().getIp4Address().toString(), value.allocationTime().toString());
+ value.subscriberId(), value.location(), value.type(), value.macAddress().toString(),
+ value.circuitId(), value.ipAddress().getIp4Address().toString(), value.allocationTime().toString());
});
}
}
diff --git a/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayRemoveAllocationsCommand.java b/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayRemoveAllocationsCommand.java
index 7120923..1f53909 100644
--- a/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayRemoveAllocationsCommand.java
+++ b/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayRemoveAllocationsCommand.java
@@ -53,12 +53,12 @@
PortNumber port = PortNumber.portNumber(strPort);
ConnectPoint cp = new ConnectPoint(deviceId, port);
- Boolean success = service.removeAllocationByConnectPoint(cp);
+ Boolean success = service.removeAllocationsByConnectPoint(cp);
if (success) {
- print("DHCP Allocation removed for port %s on device %s", strPort, strDeviceId);
+ print("DHCP Allocation(s) removed for port %s on device %s", strPort, strDeviceId);
} else {
- print("DHCP Allocation not found for port %s on device %s", strPort, strDeviceId);
+ print("DHCP Allocation(s) not found for port %s on device %s", strPort, strDeviceId);
}
}