Add UT for show/clear

Author: ayurkiv

clear/main.py

@@ -224,6 +224,9 @@ def drop():
 @drop.command('counters')
 def clear_pg_counters():
     """Clear priority-group dropped packets counter """
+
+    if os.geteuid() != 0 and os.environ.get("UTILITIES_UNIT_TESTING", "0") != "2":
+        exit("Root privileges are required for this operation")
     command = 'pg-drop -c clear'
     run_command(command)
 

doc/Command-Reference.md

@@ -6095,7 +6095,7 @@ This command displays the user watermark for the queues (Egress shared pool occu
 **show priority-group**
 
 This command displays:
-1) the user watermark or persistent-watermark for the Ingress "headroom" or "shared pool occupancy" per priority-group for  all ports.
+1) The user watermark or persistent-watermark for the Ingress "headroom" or "shared pool occupancy" per priority-group for all ports.
 2) Dropped packets per priority-group for all ports
 
 - Usage:

scripts/pg-drop

@@ -7,12 +7,10 @@
 #####################################################################
 import _pickle as pickle
 import argparse
-import json
 import os
 import sys
 from collections import OrderedDict
 
-from swsscommon.swsscommon import SonicV2Connector
 from natsort import natsorted
 from tabulate import tabulate
 
@@ -28,6 +26,8 @@ try:
 except KeyError:
     pass
 
+from swsscommon.swsscommon import SonicV2Connector
+
 STATUS_NA = 'N/A'
 
 COUNTER_TABLE_PREFIX = "COUNTERS:"

tests/mock_tables/counters_db.json

@@ -294,6 +294,80 @@
         "SAI_SWITCH_STAT_OUT_DROP_REASON_RANGE_BASE": "1000",
         "SAI_SWITCH_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS": "0"
     },
+
+    "COUNTERS:oid:0x1a00000000034f": {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "800"
+    },
+    "COUNTERS:oid:0x1a000000000350" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "801"
+    },
+    "COUNTERS:oid:0x1a000000000351" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "802"
+    },
+    "COUNTERS:oid:0x1a000000000352" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "803"
+    },
+    "COUNTERS:oid:0x1a000000000353" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "804"
+    },
+    "COUNTERS:oid:0x1a000000000354" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "805"
+    },
+    "COUNTERS:oid:0x1a000000000355" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "806"
+    },
+    "COUNTERS:oid:0x1a000000000356" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "807"
+    },
+    "COUNTERS:oid:0x1a000000000377" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "400"
+    },
+    "COUNTERS:oid:0x1a000000000378" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "401"
+    },
+    "COUNTERS:oid:0x1a000000000379" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "402"
+    },
+    "COUNTERS:oid:0x1a00000000037a" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "403"
+    },
+    "COUNTERS:oid:0x1a00000000037b" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "404"
+    },
+    "COUNTERS:oid:0x1a00000000037c" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "405"
+    },
+    "COUNTERS:oid:0x1a00000000037d" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "406"
+    },
+    "COUNTERS:oid:0x1a00000000037e" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "407"
+    },
+    "COUNTERS:oid:0x1a00000000039f" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "100"
+    },
+    "COUNTERS:oid:0x1a0000000003a0" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "101"
+    },
+    "COUNTERS:oid:0x1a0000000003a1" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "102"
+    },
+    "COUNTERS:oid:0x1a0000000003a2" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "103"
+    },
+    "COUNTERS:oid:0x1a0000000003a3" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "104"
+    },
+    "COUNTERS:oid:0x1a0000000003a4" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "105"
+    },
+    "COUNTERS:oid:0x1a0000000003a5" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "106"
+    },
+    "COUNTERS:oid:0x1a0000000003a6" : {
+        "SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "107"
+    },
+
     "COUNTERS_PORT_NAME_MAP": {
         "Ethernet0": "oid:0x1000000000012",
         "Ethernet4": "oid:0x1000000000013",

tests/pgdropstat_test.py

@@ -0,0 +1,72 @@
+import os
+import sys
+
+import show.main as show
+import clear.main as clear
+
+from click.testing import CliRunner
+
+test_path = os.path.dirname(os.path.abspath(__file__))
+modules_path = os.path.dirname(test_path)
+scripts_path = os.path.join(modules_path, "scripts")
+sys.path.insert(0, test_path)
+sys.path.insert(0, modules_path)
+
+
+show_pg_dropped_packet_stat="""\
+Ingress PG dropped packets:
+     Port    PG0    PG1    PG2    PG3    PG4    PG5    PG6    PG7
+---------  -----  -----  -----  -----  -----  -----  -----  -----
+Ethernet0    800    801    802    803    804    805    806    807
+Ethernet4    400    401    402    403    404    405    406    407
+Ethernet8    100    101    102    103    104    105    106    107
+"""
+
+show_cleared_pg_dropped_packet_stat="""\
+Ingress PG dropped packets:
+     Port    PG0    PG1    PG2    PG3    PG4    PG5    PG6    PG7
+---------  -----  -----  -----  -----  -----  -----  -----  -----
+Ethernet0      0      0      0      0      0      0      0      0
+Ethernet4      0      0      0      0      0      0      0      0
+Ethernet8      0      0      0      0      0      0      0      0
+"""
+
+class TestPgDropstat(object):
+    @classmethod
+    def setup_class(cls):
+        os.environ["PATH"] += os.pathsep + scripts_path
+        os.environ['UTILITIES_UNIT_TESTING'] = "2"
+        print("SETUP")
+
+    def test_show_pg_drop_show(self):
+        self.executor(clear_before_show = False)
+
+    def test_show_pg_drop_clear(self):
+        self.executor(clear_before_show = True)
+
+    def executor(self, clear_before_show):
+        runner = CliRunner()
+        show_output = show_pg_dropped_packet_stat
+
+        # Clear stats
+        if clear_before_show:
+            result = runner.invoke(clear.cli.commands["priority-group"].commands["drop"].commands["counters"], [])
+            assert result.exit_code == 0
+            show_output = show_cleared_pg_dropped_packet_stat
+
+        result = runner.invoke(show.cli.commands["priority-group"].commands["drop"].commands["counters"], [])
+
+        print(result.exit_code)
+        print(result.output)
+
+        assert result.exit_code == 0
+        assert result.output == show_output
+
+    @classmethod
+    def teardown_class(cls):
+        os.environ["PATH"] = os.pathsep.join(os.environ["PATH"].split(os.pathsep)[:-1])
+        os.environ['UTILITIES_UNIT_TESTING'] = "0"
+        dropstat_dir_prefix = '/tmp/dropstat'
+        dir_path = "{}-{}/".format(dropstat_dir_prefix, os.getuid())
+        os.system("rm -rf {}".format(dir_path))
+        print("TEARDOWN")