Merge show plugins into show_dhcp_relay.py

dockers/docker-dhcp-relay/cli-plugin-tests/mock_config.py

@@ -5,7 +5,10 @@
             "config_db": {
                 "DHCP_RELAY": {
                     "Vlan1000": {
-                        "dhcpv6_servers": "fc02:2000::1,fc02:2000::2",
+                        "dhcpv6_servers": [
+                            "fc02:2000::1",
+                            "fc02:2000::2"
+                        ],
                         "dhcpv6_option|rfc6939_support": "true"
                     }
                 }

dockers/docker-dhcp-relay/cli-plugin-tests/test_show_dhcp6relay_counters.py

@@ -2,7 +2,7 @@
 import os
 from unittest import mock
 sys.path.append('../cli/show/plugins/')
-import show_dhcp6relay_counters as show
+import show_dhcp_relay as show
 
 from click.testing import CliRunner
 

dockers/docker-dhcp-relay/cli-plugin-tests/test_show_dhcpv6_helper.py

@@ -2,7 +2,7 @@
 import sys
 import os
 sys.path.append('../cli/show/plugins/')
-import show_dhcpv6_helper as show
+import show_dhcp_relay as show
 from click.testing import CliRunner
 from swsscommon import swsscommon
 from mock_config import TEST_DATA

dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py

@@ -1,5 +1,22 @@
+import click
 from natsort import natsorted
+from tabulate import tabulate
 import show.vlan as vlan
+import utilities_common.cli as clicommon
+
+from swsscommon.swsscommon import ConfigDBConnector
+from swsscommon.swsscommon import SonicV2Connector
+
+
+# STATE_DB Table
+DHCPv6_COUNTER_TABLE = 'DHCPv6_COUNTER_TABLE'
+
+# DHCPv6 Counter Messages
+messages = ["Solicit", "Advertise", "Request", "Confirm", "Renew", "Rebind", "Reply", "Release", "Decline", "Relay-Forward", "Relay-Reply"]
+
+# DHCP_RELAY Config Table
+DHCP_RELAY = 'DHCP_RELAY'
+config_db = ConfigDBConnector()
 
 def get_dhcp_helper_address(ctx, vlan):
     cfg, _ = ctx
@@ -16,5 +33,99 @@ def get_dhcp_helper_address(ctx, vlan):
 vlan.VlanBrief.register_column('DHCP Helper Address', get_dhcp_helper_address)
 
 
-def register(cli):
+class DHCPv6_Counter(object):
+    def __init__(self):
+        self.db = SonicV2Connector(use_unix_socket_path=False)
+        self.db.connect(self.db.STATE_DB)
+        self.table_name = DHCPv6_COUNTER_TABLE + self.db.get_db_separator(self.db.STATE_DB)
+
+
+    def get_interface(self):
+        """ Get all names of all interfaces in DHCPv6_COUNTER_TABLE """
+        vlans = []
+        for key in self.db.keys(self.db.STATE_DB):
+            if DHCPv6_COUNTER_TABLE in key:
+                vlans.append(key[21:])
+        return vlans
+
+
+    def get_dhcp6relay_msg_count(self, interface, msg):
+        """ Get count of a dhcp6relay message """
+        count = self.db.get(self.db.STATE_DB, self.table_name + str(interface), str(msg))
+        data = [str(msg), count]
+        return data
+
+
+    def clear_table(self, interface):
+        """ Reset all message counts to 0 """
+        for msg in messages:
+            self.db.set(self.db.STATE_DB, self.table_name + str(interface), str(msg), '0') 
+
+def print_count(counter, intf):
+    """Print count of each message"""
+    data = []
+    for i in messages:
+        data.append(counter.get_dhcp6relay_msg_count(intf, i))
+    print(tabulate(data, headers = ["Message Type", intf], tablefmt='simple', stralign='right') + "\n")
+
+
+#
+# 'dhcp6relay_counters' group ###
+#
+
+
+@click.group(cls=clicommon.AliasedGroup, name="dhcp6relay_counters")
+def dhcp6relay_counters():
+    """Show DHCPv6 counter"""
     pass
+
+
+# 'counts' subcommand ("show dhcp6relay_counters counts")
+@dhcp6relay_counters.command('counts')
+@click.option('-i', '--interface', required=False)
+@click.option('--verbose', is_flag=True, help="Enable verbose output")
+def counts(interface, verbose):
+    """Show dhcp6relay message counts"""
+
+    counter = DHCPv6_Counter()
+    counter_intf = counter.get_interface()
+
+    if interface:
+        print_count(counter, interface)
+    else:
+        for intf in counter_intf:
+                print_count(counter, intf)
+
+
+
+@click.group(cls=clicommon.AliasedGroup, name="dhcprelay_helper")
+def dhcp_relay_helper():
+    """Show DHCP_Relay helper information"""
+    pass
+
+@dhcp_relay_helper.command('ipv6')
+def get_dhcpv6_helper_address():
+    """Parse through DHCP_RELAY table for each interface in config_db.json and print dhcpv6 helpers in table format"""
+    if config_db is not None:
+        config_db.connect()
+        table_data = config_db.get_table(DHCP_RELAY)
+        if table_data is not None:
+            vlans = config_db.get_keys(DHCP_RELAY)
+            for vlan in vlans: 
+                output = get_data(table_data, vlan)
+                print(output)
+
+
+def get_data(table_data, vlan):
+    vlan_data = table_data.get(vlan)
+    helpers_data = vlan_data.get('dhcpv6_servers')
+    if helpers_data is not None:
+        addr = {vlan:[]}
+        for ip in helpers_data:
+            addr[vlan].append(ip)
+    output = tabulate({'Interface':[vlan], vlan:addr.get(vlan)}, tablefmt='simple', stralign='right') + '\n'
+    return output
+
+def register(cli):
+    cli.add_command(dhcp6relay_counters)
+    cli.add_command(dhcp_relay_helper)

rules/docker-dhcp-relay.mk

@@ -53,8 +53,6 @@ $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /var/tmp/
 
 $(DOCKER_DHCP_RELAY)_CLI_CONFIG_PLUGIN = /cli/config/plugins/dhcp_relay.py
 $(DOCKER_DHCP_RELAY)_CLI_SHOW_PLUGIN = /cli/show/plugins/show_dhcp_relay.py
-$(DOCKER_DHCP_RELAY)_CLI_SHOW_PLUGIN = /cli/show/plugins/show_dhcp6relay_counters.py
-$(DOCKER_DHCP_RELAY)_CLI_SHOW_PLUGIN = /cli/show/plugins/show_dhcpv6_helper.py
 $(DOCKER_DHCP_RELAY)_CLI_CLEAR_PLUGIN = /cli/clear/plugins/clear_dhcp6relay_counter.py
 
 $(DOCKER_DHCP_RELAY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)