[dhcp-relay] Add dhcp_relay show cli

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

@@ -1,6 +1,6 @@
-TEST_DATA = [ 
+TEST_DATA = [
     [
-        "DHCPv6_Helpers",
+        "ipv6",
         {
             "config_db": {
                 "DHCP_RELAY": {
@@ -12,7 +12,22 @@
                         "dhcpv6_option|rfc6939_support": "true"
                     }
                 }
-            },
+            }
         },
     ],
+    [
+        "ipv4",
+        {
+            "config_db": {
+                "VLAN": {
+                    "Vlan1000": {
+                        "dhcp_servers": [
+                            "192.0.0.1",
+                            "192.0.0.2"
+                        ]
+                    }
+                }
+            }
+        }
+    ]
 ]

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

@@ -1,28 +1,71 @@
-import os
+import pytest
 import sys
-import traceback
+import os
+sys.path.append('../cli/show/plugins/')
+import show_dhcp_relay as show
+import show.vlan as vlan
+from swsscommon import swsscommon
+from mock_config import TEST_DATA
+from parameterized import parameterized
+from pyfakefs.fake_filesystem_unittest import patchfs
 from unittest import mock
 
-from click.testing import CliRunner
+try:
+    sys.path.insert(0, '../../../src/sonic-host-services/tests/common')
+    from mock_configdb import MockConfigDb
+    swsscommon.ConfigDBConnector = MockConfigDb
+except KeyError:
+    pass
 
-import show.vlan as vlan
-from utilities_common.db import Db
+expected_ipv6_table = """\
+--------  ------------
+Vlan1000  fc02:2000::1
+          fc02:2000::2
+--------  ------------
+"""
+
+expected_ipv4_table = """\
+--------  ---------
+Vlan1000  192.0.0.1
+          192.0.0.2
+--------  ---------
+"""
+
+DBCONFIG_PATH = '/var/run/redis/sonic-db/database_config.json'
+
+IP_VER_TEST_PARAM_MAP = {
+    "ipv4": {
+        "entry": "dhcp_servers",
+        "table": "VLAN"
+    },
+    "ipv6": {
+        "entry": "dhcpv6_servers",
+        "table": "DHCP_RELAY"
+    }
+}
 
-sys.path.insert(0, '../cli/show/plugins/')
-import show_dhcp_relay
 
+def test_plugin_registration():
+    cli = mock.MagicMock()
+    show.register(cli)
+    assert 'DHCP Helper Address' in dict(vlan.VlanBrief.COLUMNS)
 
-class TestVlanDhcpRelay(object):
-    def test_plugin_registration(self):
-        cli = mock.MagicMock()
-        show_dhcp_relay.register(cli)
-        assert 'DHCP Helper Address' in dict(vlan.VlanBrief.COLUMNS)
 
-    def test_dhcp_relay_column_output(self):
-        ctx = (
-            ({'Vlan100': {'dhcp_servers': ['192.0.0.1', '192.168.0.2']}}, {}, {}),
-            (),
-        )
-        assert show_dhcp_relay.get_dhcp_helper_address(ctx, 'Vlan100') == '192.0.0.1\n192.168.0.2'
+def test_dhcp_relay_column_output():
+    ctx = (
+        ({'Vlan1001': {'dhcp_servers': ['192.0.0.1', '192.168.0.2']}}, {}, {}),
+        (),
+    )
+    assert show.get_dhcp_helper_address(ctx, 'Vlan1001') == '192.0.0.1\n192.168.0.2'
 
 
+@parameterized.expand(TEST_DATA)
+@patchfs
+def test_show_dhcp_relay(test_name, test_data, fs):
+    if not os.path.exists(DBCONFIG_PATH):
+        fs.create_file(DBCONFIG_PATH)
+    MockConfigDb.set_config_db(test_data["config_db"])
+    config_db = MockConfigDb()
+    table = config_db.get_table(IP_VER_TEST_PARAM_MAP[test_name]["table"])
+    result = show.get_data(table, "Vlan1000", IP_VER_TEST_PARAM_MAP[test_name]["entry"])
+    assert result == (expected_ipv4_table if test_name == "ipv4" else expected_ipv6_table)

dockers/docker-dhcp-relay/cli/clear/plugins/clear_dhcp6relay_counter.py

@@ -1,32 +1,56 @@
-import sys
 import click
 import importlib
 dhcp6_relay = importlib.import_module('show.plugins.dhcp-relay')
 
 import utilities_common.cli as clicommon
 
 
+def clear_dhcp_relay_ipv6_counter(interface):
+    counter = dhcp6_relay.DHCPv6_Counter()
+    counter_intf = counter.get_interface()
+
+    if interface:
+        counter.clear_table(interface)
+    else:
+        for intf in counter_intf:
+            counter.clear_table(intf)
+
+
 # sonic-clear dhcp6relay_counters
 @click.group(cls=clicommon.AliasedGroup)
 def dhcp6relay_clear():
     pass
 
+
 @dhcp6relay_clear.command('dhcp6relay_counters')
 @click.option('-i', '--interface', required=False)
 def dhcp6relay_clear_counters(interface):
     """ Clear dhcp6relay message counts """
+    clear_dhcp_relay_ipv6_counter(interface)
 
-    counter = dhcp6_relay.DHCPv6_Counter()
-    counter_intf = counter.get_interface()
 
-    if interface:
-        counter.clear_table(interface)
-    else:
-        for intf in counter_intf:
-                counter.clear_table(intf)
+@click.group(cls=clicommon.AliasedGroup, name="dhcp_relay")
+def dhcp_relay():
+    pass
+
+
+@dhcp_relay.group(cls=clicommon.AliasedGroup, name="ipv6")
+def dhcp_relay_ipv6():
+    pass
+
+
+@dhcp_relay_ipv6.command('counters')
+@click.option('-i', '--interface', required=False)
+def clear_dhcp_relay_ipv6_counters(interface):
+    """ Clear dhcp_relay ipv6 message counts """
+    clear_dhcp_relay_ipv6_counter(interface)
+
 
 def register(cli):
     cli.add_command(dhcp6relay_clear_counters)
+    cli.add_command(dhcp_relay)
+
 
 if __name__ == '__main__':
     dhcp6relay_clear_counters()
+    dhcp_relay()