From 9c1c82e9ff708616017d391213751a3b02492e6d Mon Sep 17 00:00:00 2001
From: jcaiMR <111116206+jcaiMR@users.noreply.github.com>
Date: Mon, 11 Sep 2023 21:08:06 +0800
Subject: [PATCH] add show dhcp_relay ipv4 counter entry, fix interface name
 offset issue (#16507)

Why I did it
Add another cli entry: show dhcp_relay ipv4 counter
Fix get all interface offset issue

Work item tracking
Microsoft ADO (17271822):
How I did it
show dhcp_relay ipv4 counter -i [ifname]
show dhcp4relay_counters counts -i [ifname]

How to verify it
show dhcp4relay_counters counts | more 10
Message Type Ethernet144(RX)
---
 .../docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py b/dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py
index 0d360aef9b..578f687f9c 100644
--- a/dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py
+++ b/dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py
@@ -56,7 +56,7 @@ class DHCPv4_Counter(object):
         interfaces = []
         for key in self.db.keys(self.db.STATE_DB):
             if DHCPv4_COUNTER_TABLE in key:
-                interfaces.append(key[21:])
+                interfaces.append(key[19:])
         return interfaces
 
     def get_dhcp4relay_msg_count(self, interface, dir):
@@ -274,6 +274,10 @@ def dhcp_relay_ipv4_destination():
 def dhcp_relay_ipv6_destination():
     get_dhcp_relay(DHCP_RELAY, DHCPV6_SERVERS, with_header=True)
 
+@dhcp_relay_ipv4.command("counters")
+@click.option('-i', '--interface', required=False)
+def dhcp_relay_ip4counters(interface):
+    ipv4_counters(interface)
 
 @dhcp_relay_ipv6.command("counters")
 @click.option('-i', '--interface', required=False)