diff --git a/scripts/watermarkstat b/scripts/watermarkstat old mode 100644 new mode 100755 index 628def027788..b8184116083c --- a/scripts/watermarkstat +++ b/scripts/watermarkstat @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python ##################################################################### # @@ -10,12 +10,24 @@ from __future__ import print_function import argparse import json +import os import sys import swsssdk from natsort import natsorted from tabulate import tabulate +# mock the redis for unit test purposes # +try: + if os.environ["UTILITIES_UNIT_TESTING"] == "2": + modules_path = os.path.join(os.path.dirname(__file__), "..") + tests_path = os.path.join(modules_path, "tests") + sys.path.insert(0, modules_path) + sys.path.insert(0, tests_path) + import mock_tables.dbconnector + +except KeyError: + pass headerBufferPool = ['Pool', 'Bytes'] diff --git a/setup.py b/setup.py index a84d033e27d9..d41154ff74d7 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,8 @@ 'mock_tables/asic0/*.json', 'mock_tables/asic1/*.json', 'filter_fdb_input/*', - 'pfcwd_input/*'] + 'pfcwd_input/*', + 'wm_input/*'] }, scripts=[ 'scripts/aclshow', diff --git a/tests/mock_tables/counters_db.json b/tests/mock_tables/counters_db.json index 1411e667e3d4..5636f27c1cd5 100644 --- a/tests/mock_tables/counters_db.json +++ b/tests/mock_tables/counters_db.json @@ -119,7 +119,7 @@ "Bytes": "1000", "Packets": "1001" }, - "COUNTERS:oid:0x1000000000002": { + "COUNTERS:oid:0x1000000000012": { "SAI_PORT_STAT_IF_IN_UCAST_PKTS": "8", "SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_IF_IN_OCTETS" : "800", @@ -147,7 +147,7 @@ "SAI_PORT_STAT_PFC_6_TX_PKTS": "216", "SAI_PORT_STAT_PFC_7_TX_PKTS": "217" }, - "COUNTERS:oid:0x1000000000004": { + "COUNTERS:oid:0x1000000000013": { "SAI_PORT_STAT_IF_IN_UCAST_PKTS": "4", "SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_IF_IN_OCTETS" : "400", @@ -175,7 +175,7 @@ "SAI_PORT_STAT_PFC_6_TX_PKTS": "416", "SAI_PORT_STAT_PFC_7_TX_PKTS": "417" }, - "COUNTERS:oid:0x1000000000006": { + "COUNTERS:oid:0x1000000000014": { "SAI_PORT_STAT_IF_IN_UCAST_PKTS": "6", "SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS": "0", "SAI_PORT_STAT_IF_IN_OCTETS" : "600", @@ -208,14 +208,71 @@ "SAI_SWITCH_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS": "0" }, "COUNTERS_PORT_NAME_MAP": { - "Ethernet0": "oid:0x1000000000002", - "Ethernet4": "oid:0x1000000000004", - "Ethernet8": "oid:0x1000000000006" + "Ethernet0": "oid:0x1000000000012", + "Ethernet4": "oid:0x1000000000013", + "Ethernet8": "oid:0x1000000000014" }, "COUNTERS_QUEUE_NAME_MAP": { - "Ethernet0:3": "oid:0x1500000000035b", - "Ethernet4:3": "oid:0x15000000000383", - "Ethernet8:4": "oid:0x150000000003ac" + "Ethernet0:0": "oid:0x15000000000357", + "Ethernet0:1": "oid:0x15000000000358", + "Ethernet0:10": "oid:0x15000000000363", + "Ethernet0:11": "oid:0x15000000000364", + "Ethernet0:12": "oid:0x15000000000365", + "Ethernet0:13": "oid:0x15000000000366", + "Ethernet0:14": "oid:0x15000000000367", + "Ethernet0:15": "oid:0x15000000000368", + "Ethernet0:16": "oid:0x15000000000369", + "Ethernet0:17": "oid:0x1500000000036a", + "Ethernet0:18": "oid:0x1500000000036b", + "Ethernet0:19": "oid:0x1500000000036c", + "Ethernet0:2": "oid:0x15000000000359", + "Ethernet0:3": "oid:0x1500000000035a", + "Ethernet0:4": "oid:0x1500000000035b", + "Ethernet0:5": "oid:0x1500000000035c", + "Ethernet0:6": "oid:0x1500000000035d", + "Ethernet0:7": "oid:0x1500000000035e", + "Ethernet0:8": "oid:0x1500000000035f", + "Ethernet0:9": "oid:0x15000000000360", + "Ethernet4:0": "oid:0x1500000000037f", + "Ethernet4:1": "oid:0x15000000000380", + "Ethernet4:10": "oid:0x1500000000038b", + "Ethernet4:11": "oid:0x1500000000038c", + "Ethernet4:12": "oid:0x1500000000038d", + "Ethernet4:13": "oid:0x1500000000038e", + "Ethernet4:14": "oid:0x1500000000038f", + "Ethernet4:15": "oid:0x15000000000390", + "Ethernet4:16": "oid:0x15000000000391", + "Ethernet4:17": "oid:0x15000000000392", + "Ethernet4:18": "oid:0x15000000000393", + "Ethernet4:19": "oid:0x15000000000394", + "Ethernet4:2": "oid:0x15000000000381", + "Ethernet4:3": "oid:0x15000000000382", + "Ethernet4:4": "oid:0x15000000000383", + "Ethernet4:5": "oid:0x15000000000384", + "Ethernet4:6": "oid:0x15000000000385", + "Ethernet4:7": "oid:0x15000000000386", + "Ethernet4:8": "oid:0x15000000000387", + "Ethernet4:9": "oid:0x15000000000388", + "Ethernet8:0": "oid:0x150000000003a7", + "Ethernet8:1": "oid:0x150000000003a8", + "Ethernet8:10": "oid:0x150000000003b3", + "Ethernet8:11": "oid:0x150000000003b4", + "Ethernet8:12": "oid:0x150000000003b5", + "Ethernet8:13": "oid:0x150000000003b6", + "Ethernet8:14": "oid:0x150000000003b7", + "Ethernet8:15": "oid:0x150000000003b8", + "Ethernet8:16": "oid:0x150000000003b9", + "Ethernet8:17": "oid:0x150000000003ba", + "Ethernet8:18": "oid:0x150000000003bb", + "Ethernet8:19": "oid:0x150000000003bc", + "Ethernet8:2": "oid:0x150000000003a9", + "Ethernet8:3": "oid:0x150000000003aa", + "Ethernet8:4": "oid:0x150000000003ab", + "Ethernet8:5": "oid:0x150000000003ac", + "Ethernet8:6": "oid:0x150000000003ad", + "Ethernet8:7": "oid:0x150000000003ae", + "Ethernet8:8": "oid:0x150000000003af", + "Ethernet8:9": "oid:0x150000000003b0" }, "COUNTERS_LAG_NAME_MAP": { "PortChannel0001": "oid:0x60000000005a1", @@ -223,6 +280,275 @@ "PortChannel0003": "oid:0x600000000063c", "PortChannel0004": "oid:0x600000000063d" }, + "COUNTERS_PG_NAME_MAP": { + "Ethernet0:0": "oid:0x1a00000000034f", + "Ethernet0:1": "oid:0x1a000000000350", + "Ethernet0:2": "oid:0x1a000000000351", + "Ethernet0:3": "oid:0x1a000000000352", + "Ethernet0:4": "oid:0x1a000000000353", + "Ethernet0:5": "oid:0x1a000000000354", + "Ethernet0:6": "oid:0x1a000000000355", + "Ethernet0:7": "oid:0x1a000000000356", + "Ethernet4:0": "oid:0x1a000000000377", + "Ethernet4:1": "oid:0x1a000000000378", + "Ethernet4:2": "oid:0x1a000000000379", + "Ethernet4:3": "oid:0x1a00000000037a", + "Ethernet4:4": "oid:0x1a00000000037b", + "Ethernet4:5": "oid:0x1a00000000037c", + "Ethernet4:6": "oid:0x1a00000000037d", + "Ethernet4:7": "oid:0x1a00000000037e", + "Ethernet8:0": "oid:0x1a00000000039f", + "Ethernet8:1": "oid:0x1a0000000003a0", + "Ethernet8:2": "oid:0x1a0000000003a1", + "Ethernet8:3": "oid:0x1a0000000003a2", + "Ethernet8:4": "oid:0x1a0000000003a3", + "Ethernet8:5": "oid:0x1a0000000003a4", + "Ethernet8:6": "oid:0x1a0000000003a5", + "Ethernet8:7": "oid:0x1a0000000003a6" + }, + "COUNTERS_BUFFER_POOL_NAME_MAP": { + "egress_lossless_pool": "oid:0x18000000000b64", + "egress_lossy_pool": "oid:0x18000000000b65", + "ingress_lossless_pool": "oid:0x18000000000b66" + }, + "COUNTERS_PG_PORT_MAP": { + "oid:0x1a00000000034f": "oid:0x1000000000012", + "oid:0x1a000000000350": "oid:0x1000000000012", + "oid:0x1a000000000351": "oid:0x1000000000012", + "oid:0x1a000000000352": "oid:0x1000000000012", + "oid:0x1a000000000353": "oid:0x1000000000012", + "oid:0x1a000000000354": "oid:0x1000000000012", + "oid:0x1a000000000355": "oid:0x1000000000012", + "oid:0x1a000000000356": "oid:0x1000000000012", + "oid:0x1a000000000377": "oid:0x1000000000013", + "oid:0x1a000000000378": "oid:0x1000000000013", + "oid:0x1a000000000379": "oid:0x1000000000013", + "oid:0x1a00000000037a": "oid:0x1000000000013", + "oid:0x1a00000000037b": "oid:0x1000000000013", + "oid:0x1a00000000037c": "oid:0x1000000000013", + "oid:0x1a00000000037d": "oid:0x1000000000013", + "oid:0x1a00000000037e": "oid:0x1000000000013", + "oid:0x1a00000000039f": "oid:0x1000000000014", + "oid:0x1a0000000003a0": "oid:0x1000000000014", + "oid:0x1a0000000003a1": "oid:0x1000000000014", + "oid:0x1a0000000003a2": "oid:0x1000000000014", + "oid:0x1a0000000003a3": "oid:0x1000000000014", + "oid:0x1a0000000003a4": "oid:0x1000000000014", + "oid:0x1a0000000003a5": "oid:0x1000000000014", + "oid:0x1a0000000003a6": "oid:0x1000000000014" + }, + "COUNTERS_QUEUE_PORT_MAP": { + "oid:0x15000000000357": "oid:0x1000000000012", + "oid:0x15000000000358": "oid:0x1000000000012", + "oid:0x15000000000359": "oid:0x1000000000012", + "oid:0x1500000000035a": "oid:0x1000000000012", + "oid:0x1500000000035b": "oid:0x1000000000012", + "oid:0x1500000000035c": "oid:0x1000000000012", + "oid:0x1500000000035d": "oid:0x1000000000012", + "oid:0x1500000000035e": "oid:0x1000000000012", + "oid:0x1500000000035f": "oid:0x1000000000012", + "oid:0x15000000000360": "oid:0x1000000000012", + "oid:0x15000000000363": "oid:0x1000000000012", + "oid:0x15000000000364": "oid:0x1000000000012", + "oid:0x15000000000365": "oid:0x1000000000012", + "oid:0x15000000000366": "oid:0x1000000000012", + "oid:0x15000000000367": "oid:0x1000000000012", + "oid:0x15000000000368": "oid:0x1000000000012", + "oid:0x15000000000369": "oid:0x1000000000012", + "oid:0x1500000000036a": "oid:0x1000000000012", + "oid:0x1500000000036b": "oid:0x1000000000012", + "oid:0x1500000000036c": "oid:0x1000000000012", + "oid:0x1500000000037f": "oid:0x1000000000013", + "oid:0x15000000000380": "oid:0x1000000000013", + "oid:0x15000000000381": "oid:0x1000000000013", + "oid:0x15000000000382": "oid:0x1000000000013", + "oid:0x15000000000383": "oid:0x1000000000013", + "oid:0x15000000000384": "oid:0x1000000000013", + "oid:0x15000000000385": "oid:0x1000000000013", + "oid:0x15000000000386": "oid:0x1000000000013", + "oid:0x15000000000387": "oid:0x1000000000013", + "oid:0x15000000000388": "oid:0x1000000000013", + "oid:0x1500000000038b": "oid:0x1000000000013", + "oid:0x1500000000038c": "oid:0x1000000000013", + "oid:0x1500000000038d": "oid:0x1000000000013", + "oid:0x1500000000038e": "oid:0x1000000000013", + "oid:0x1500000000038f": "oid:0x1000000000013", + "oid:0x15000000000390": "oid:0x1000000000013", + "oid:0x15000000000391": "oid:0x1000000000013", + "oid:0x15000000000392": "oid:0x1000000000013", + "oid:0x15000000000393": "oid:0x1000000000013", + "oid:0x15000000000394": "oid:0x1000000000013", + "oid:0x150000000003a7": "oid:0x1000000000014", + "oid:0x150000000003a8": "oid:0x1000000000014", + "oid:0x150000000003a9": "oid:0x1000000000014", + "oid:0x150000000003aa": "oid:0x1000000000014", + "oid:0x150000000003ab": "oid:0x1000000000014", + "oid:0x150000000003ac": "oid:0x1000000000014", + "oid:0x150000000003ad": "oid:0x1000000000014", + "oid:0x150000000003ae": "oid:0x1000000000014", + "oid:0x150000000003af": "oid:0x1000000000014", + "oid:0x150000000003b0": "oid:0x1000000000014", + "oid:0x150000000003b3": "oid:0x1000000000014", + "oid:0x150000000003b4": "oid:0x1000000000014", + "oid:0x150000000003b5": "oid:0x1000000000014", + "oid:0x150000000003b6": "oid:0x1000000000014", + "oid:0x150000000003b7": "oid:0x1000000000014", + "oid:0x150000000003b8": "oid:0x1000000000014", + "oid:0x150000000003b9": "oid:0x1000000000014", + "oid:0x150000000003ba": "oid:0x1000000000014", + "oid:0x150000000003bb": "oid:0x1000000000014", + "oid:0x150000000003bc": "oid:0x1000000000014" + }, + "COUNTERS_PG_INDEX_MAP": { + "oid:0x1a00000000034f": "0", + "oid:0x1a000000000350": "1", + "oid:0x1a000000000351": "2", + "oid:0x1a000000000352": "3", + "oid:0x1a000000000353": "4", + "oid:0x1a000000000354": "5", + "oid:0x1a000000000355": "6", + "oid:0x1a000000000356": "7", + "oid:0x1a000000000377": "0", + "oid:0x1a000000000378": "1", + "oid:0x1a000000000379": "2", + "oid:0x1a00000000037a": "3", + "oid:0x1a00000000037b": "4", + "oid:0x1a00000000037c": "5", + "oid:0x1a00000000037d": "6", + "oid:0x1a00000000037e": "7", + "oid:0x1a00000000039f": "0", + "oid:0x1a0000000003a0": "1", + "oid:0x1a0000000003a1": "2", + "oid:0x1a0000000003a2": "3", + "oid:0x1a0000000003a3": "4", + "oid:0x1a0000000003a4": "5", + "oid:0x1a0000000003a5": "6", + "oid:0x1a0000000003a6": "7" + }, + "COUNTERS_QUEUE_INDEX_MAP": { + "oid:0x15000000000357": "0", + "oid:0x15000000000358": "1", + "oid:0x15000000000359": "2", + "oid:0x1500000000035a": "3", + "oid:0x1500000000035b": "4", + "oid:0x1500000000035c": "5", + "oid:0x1500000000035d": "6", + "oid:0x1500000000035e": "7", + "oid:0x1500000000035f": "8", + "oid:0x15000000000360": "9", + "oid:0x15000000000363": "10", + "oid:0x15000000000364": "11", + "oid:0x15000000000365": "12", + "oid:0x15000000000366": "13", + "oid:0x15000000000367": "14", + "oid:0x15000000000368": "15", + "oid:0x15000000000369": "16", + "oid:0x1500000000036a": "17", + "oid:0x1500000000036b": "18", + "oid:0x1500000000036c": "19", + "oid:0x1500000000037f": "0", + "oid:0x15000000000380": "1", + "oid:0x15000000000381": "2", + "oid:0x15000000000382": "3", + "oid:0x15000000000383": "4", + "oid:0x15000000000384": "5", + "oid:0x15000000000385": "6", + "oid:0x15000000000386": "7", + "oid:0x15000000000387": "8", + "oid:0x15000000000388": "9", + "oid:0x1500000000038b": "10", + "oid:0x1500000000038c": "11", + "oid:0x1500000000038d": "12", + "oid:0x1500000000038e": "13", + "oid:0x1500000000038f": "14", + "oid:0x15000000000390": "15", + "oid:0x15000000000391": "16", + "oid:0x15000000000392": "17", + "oid:0x15000000000393": "18", + "oid:0x15000000000394": "19", + "oid:0x150000000003a7": "0", + "oid:0x150000000003a8": "1", + "oid:0x150000000003a9": "2", + "oid:0x150000000003aa": "3", + "oid:0x150000000003ab": "4", + "oid:0x150000000003ac": "5", + "oid:0x150000000003ad": "6", + "oid:0x150000000003ae": "7", + "oid:0x150000000003af": "8", + "oid:0x150000000003b0": "9", + "oid:0x150000000003b3": "10", + "oid:0x150000000003b4": "11", + "oid:0x150000000003b5": "12", + "oid:0x150000000003b6": "13", + "oid:0x150000000003b7": "14", + "oid:0x150000000003b8": "15", + "oid:0x150000000003b9": "16", + "oid:0x150000000003ba": "17", + "oid:0x150000000003bb": "18", + "oid:0x150000000003bc": "19" + }, + "COUNTERS_QUEUE_TYPE_MAP": { + "oid:0x15000000000357": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000358": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000359": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000035a": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000035b": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000035c": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000035d": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000035e": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000035f": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000360": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000363": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000364": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000365": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000366": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000367": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000368": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000369": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000036a": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000036b": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000036c": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000037f": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000380": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000381": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000382": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000383": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000384": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000385": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000386": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000387": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x15000000000388": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x1500000000038b": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000038c": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000038d": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000038e": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x1500000000038f": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000390": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000391": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000392": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000393": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x15000000000394": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003a7": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003a8": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003a9": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003aa": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003ab": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003ac": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003ad": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003ae": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003af": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003b0": "SAI_QUEUE_TYPE_UNICAST", + "oid:0x150000000003b3": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003b4": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003b5": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003b6": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003b7": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003b8": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003b9": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003ba": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003bb": "SAI_QUEUE_TYPE_MULTICAST", + "oid:0x150000000003bc": "SAI_QUEUE_TYPE_MULTICAST" + }, "COUNTERS_DEBUG_NAME_PORT_STAT_MAP": { "DEBUG_0": "SAI_PORT_STAT_IN_DROP_REASON_RANGE_BASE", "DEBUG_2": "SAI_PORT_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS" @@ -231,7 +557,7 @@ "DEBUG_1": "SAI_SWITCH_STAT_OUT_DROP_REASON_RANGE_BASE", "lowercase_counter": "SAI_SWITCH_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS" }, - "COUNTERS:oid:0x1500000000035b": { + "COUNTERS:oid:0x1500000000035a": { "PFC_WD_ACTION": "drop", "PFC_WD_DETECTION_TIME": "600000", "PFC_WD_DETECTION_TIME_LEFT": "600000", @@ -249,7 +575,7 @@ "PFC_WD_RESTORATION_TIME_LEFT": "600000", "PFC_WD_STATUS": "stormed" }, - "COUNTERS:oid:0x15000000000383": { + "COUNTERS:oid:0x15000000000382": { "PFC_WD_ACTION": "drop", "PFC_WD_DETECTION_TIME": "600000", "PFC_WD_DETECTION_TIME_LEFT": "600000", @@ -267,7 +593,7 @@ "PFC_WD_RESTORATION_TIME_LEFT": "600000", "PFC_WD_STATUS": "operational" }, - "COUNTERS:oid:0x150000000003ac": { + "COUNTERS:oid:0x150000000003ab": { "PFC_WD_ACTION": "drop", "PFC_WD_DETECTION_TIME": "600000", "PFC_WD_DETECTION_TIME_LEFT": "600000", @@ -284,5 +610,395 @@ "PFC_WD_RESTORATION_TIME": "600000", "PFC_WD_RESTORATION_TIME_LEFT": "600000", "PFC_WD_STATUS": "stormed" - } + }, + "USER_WATERMARKS:oid:0x1a00000000034f": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "100", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "100" + }, + "USER_WATERMARKS:oid:0x1a000000000350": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "101", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "101" + }, + "USER_WATERMARKS:oid:0x1a000000000351": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "102", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "102" + }, + "USER_WATERMARKS:oid:0x1a000000000352": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "103", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "103" + }, + "USER_WATERMARKS:oid:0x1a000000000353": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "104", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "104" + }, + "USER_WATERMARKS:oid:0x1a000000000354": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "105", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "105" + }, + "USER_WATERMARKS:oid:0x1a000000000355": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "106", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "106" + }, + "USER_WATERMARKS:oid:0x1a000000000356": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "107", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "107" + }, + "USER_WATERMARKS:oid:0x1a000000000377": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "400", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "400" + }, + "USER_WATERMARKS:oid:0x1a000000000378": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "401", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "401" + }, + "USER_WATERMARKS:oid:0x1a000000000379": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "402", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "402" + }, + "USER_WATERMARKS:oid:0x1a00000000037a": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "403", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "403" + }, + "USER_WATERMARKS:oid:0x1a00000000037b": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "404", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "404" + }, + "USER_WATERMARKS:oid:0x1a00000000037c": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "405", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "405" + }, + "USER_WATERMARKS:oid:0x1a00000000037d": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "406", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "406" + }, + "USER_WATERMARKS:oid:0x1a00000000037e": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "407", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "407" + }, + "USER_WATERMARKS:oid:0x1a00000000039f": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "800", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "800" + }, + "USER_WATERMARKS:oid:0x1a0000000003a0": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "801", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "801" + }, + "USER_WATERMARKS:oid:0x1a0000000003a1": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "802", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "802" + }, + "USER_WATERMARKS:oid:0x1a0000000003a2": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "803", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "803" + }, + "USER_WATERMARKS:oid:0x1a0000000003a3": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "804", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "804" + }, + "USER_WATERMARKS:oid:0x1a0000000003a4": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "805", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "805" + }, + "USER_WATERMARKS:oid:0x1a0000000003a5": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "806", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "806" + }, + "USER_WATERMARKS:oid:0x1a0000000003a6": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "807", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "807" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000034f": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "200", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "200" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000350": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "201", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "201" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000351": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "202", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "202" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000352": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "203", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "203" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000353": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "204", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "204" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000354": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "205", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "205" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000355": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "206", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "206" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000356": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "207", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "207" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000377": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "500", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "500" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000378": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "501", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "501" + }, + "PERSISTENT_WATERMARKS:oid:0x1a000000000379": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "502", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "502" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000037a": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "503", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "503" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000037b": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "504", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "504" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000037c": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "505", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "505" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000037d": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "506", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "506" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000037e": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "507", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "507" + }, + "PERSISTENT_WATERMARKS:oid:0x1a00000000039f": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "900", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "900" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a0": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "901", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "901" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a1": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "902", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "902" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a2": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "903", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "903" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a3": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "904", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "904" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a4": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "905", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "905" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a5": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "906", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "906" + }, + "PERSISTENT_WATERMARKS:oid:0x1a0000000003a6": { + "SAI_INGRESS_PRIORITY_GROUP_STAT_SHARED_WATERMARK_BYTES": "907", + "SAI_INGRESS_PRIORITY_GROUP_STAT_XOFF_ROOM_WATERMARK_BYTES": "907" + }, + "USER_WATERMARKS:oid:0x15000000000357": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2057328" + }, + "USER_WATERMARKS:oid:0x15000000000358": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2056704" + }, + "USER_WATERMARKS:oid:0x15000000000359": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x1500000000035a": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x1500000000035b": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x1500000000035c": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x1500000000035d": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x1500000000035e": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2704" + }, + "USER_WATERMARKS:oid:0x1500000000035f": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "416" + }, + "USER_WATERMARKS:oid:0x15000000000360": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "20" + }, + "USER_WATERMARKS:oid:0x1500000000037f": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000380": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000381": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000382": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "1986" + }, + "USER_WATERMARKS:oid:0x15000000000383": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2567" + }, + "USER_WATERMARKS:oid:0x15000000000384": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000385": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000386": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000387": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x15000000000388": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003a7": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003a8": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003a9": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "1040" + }, + "USER_WATERMARKS:oid:0x150000000003aa": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003ab": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003ac": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003ad": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003ae": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "USER_WATERMARKS:oid:0x150000000003af": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "8528" + }, + "USER_WATERMARKS:oid:0x150000000003b0": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "7696" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000357": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "3057328" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000358": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "3056704" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000359": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000035a": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000035b": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000035c": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000035d": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000035e": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "3704" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000035f": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "516" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000360": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "30" + }, + "PERSISTENT_WATERMARKS:oid:0x1500000000037f": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000380": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000381": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000382": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2986" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000383": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "3567" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000384": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000385": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000386": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000387": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x15000000000388": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003a7": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003a8": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003a9": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "2040" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003aa": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003ab": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003ac": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003ad": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003ae": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "0" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003af": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "9528" + }, + "PERSISTENT_WATERMARKS:oid:0x150000000003b0": { + "SAI_QUEUE_STAT_SHARED_WATERMARK_BYTES": "8696" + }, + "USER_WATERMARKS:oid:0x18000000000b64": { + "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "1000" + }, + "USER_WATERMARKS:oid:0x18000000000b65": { + "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "2000" + }, + "USER_WATERMARKS:oid:0x18000000000b66": { + "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "3000" + }, + "PERSISTENT_WATERMARKS:oid:0x18000000000b64": { + "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "2000" + }, + "PERSISTENT_WATERMARKS:oid:0x18000000000b65": { + "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "3000" + }, + "PERSISTENT_WATERMARKS:oid:0x18000000000b66": { + "SAI_BUFFER_POOL_STAT_WATERMARK_BYTES": "4000" + } } diff --git a/tests/watermarkstat_test.py b/tests/watermarkstat_test.py new file mode 100644 index 000000000000..21ec3ad14828 --- /dev/null +++ b/tests/watermarkstat_test.py @@ -0,0 +1,75 @@ +import imp +import os +import sys + +import show.main as show + +from click.testing import CliRunner +from wm_input.wm_test_vectors import * + +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) + + +class TestWatermarkstat(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_shared_wm(self): + self.executor(testData['show_pg_wm_shared']) + + def test_show_pg_headroom_wm(self): + self.executor(testData['show_pg_wm_hdrm']) + + def test_show_queue_unicast_wm(self): + self.executor(testData['show_q_wm_unicast']) + + def test_show_queue_multicast_wm(self): + self.executor(testData['show_q_wm_multicast']) + + def test_show_buffer_pool_wm(self): + self.executor(testData['show_buffer_pool_wm']) + + def test_show_pg_shared_peristent_wm(self): + self.executor(testData['show_pg_pwm_shared']) + + def test_show_pg_headroom_persistent_wm(self): + self.executor(testData['show_pg_pwm_hdrm']) + + def test_show_queue_unicast_persistent_wm(self): + self.executor(testData['show_q_pwm_unicast']) + + def test_show_queue_multicast_persistent_wm(self): + self.executor(testData['show_q_pwm_multicast']) + + def test_show_buffer_pool_persistent_wm(self): + self.executor(testData['show_buffer_pool_pwm']) + + def executor(self, testcase): + runner = CliRunner() + + for input in testcase: + if len(input['cmd']) == 3: + exec_cmd = show.cli.commands[input['cmd'][0]].commands[input['cmd'][1]].commands[input['cmd'][2]] + else: + exec_cmd = show.cli.commands[input['cmd'][0]].commands[input['cmd'][1]] + + result = runner.invoke(exec_cmd, []) + + print(result.exit_code) + print(result.output) + + assert result.exit_code == 0 + assert result.output == input['rc_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" + print("TEARDOWN") diff --git a/tests/wm_input/__init__.py b/tests/wm_input/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/wm_input/wm_test_vectors.py b/tests/wm_input/wm_test_vectors.py new file mode 100644 index 000000000000..98ccb2eaa32c --- /dev/null +++ b/tests/wm_input/wm_test_vectors.py @@ -0,0 +1,123 @@ +show_pg_wm_shared_output="""\ +Ingress shared pool occupancy per PG: + Port PG0 PG1 PG2 PG3 PG4 PG5 PG6 PG7 +--------- ----- ----- ----- ----- ----- ----- ----- ----- +Ethernet0 100 101 102 103 104 105 106 107 +Ethernet4 400 401 402 403 404 405 406 407 +Ethernet8 800 801 802 803 804 805 806 807 +""" + +show_pg_wm_hdrm_output="""\ +Ingress headroom per PG: + Port PG0 PG1 PG2 PG3 PG4 PG5 PG6 PG7 +--------- ----- ----- ----- ----- ----- ----- ----- ----- +Ethernet0 100 101 102 103 104 105 106 107 +Ethernet4 400 401 402 403 404 405 406 407 +Ethernet8 800 801 802 803 804 805 806 807 +""" + +show_pg_persistent_wm_shared_output="""\ +Ingress shared pool occupancy per PG: + Port PG0 PG1 PG2 PG3 PG4 PG5 PG6 PG7 +--------- ----- ----- ----- ----- ----- ----- ----- ----- +Ethernet0 200 201 202 203 204 205 206 207 +Ethernet4 500 501 502 503 504 505 506 507 +Ethernet8 900 901 902 903 904 905 906 907 +""" + +show_pg_persistent_wm_hdrm_output="""\ +Ingress headroom per PG: + Port PG0 PG1 PG2 PG3 PG4 PG5 PG6 PG7 +--------- ----- ----- ----- ----- ----- ----- ----- ----- +Ethernet0 200 201 202 203 204 205 206 207 +Ethernet4 500 501 502 503 504 505 506 507 +Ethernet8 900 901 902 903 904 905 906 907 +""" + +show_queue_wm_unicast_output="""\ +Egress shared pool occupancy per unicast queue: + Port UC0 UC1 UC2 UC3 UC4 UC5 UC6 UC7 UC8 UC9 +--------- ------- ------- ----- ----- ----- ----- ----- ----- ----- ----- +Ethernet0 2057328 2056704 0 0 0 0 0 2704 416 20 +Ethernet4 0 0 0 1986 2567 0 0 0 0 0 +Ethernet8 0 0 1040 0 0 0 0 0 8528 7696 +""" + +show_queue_pwm_unicast_output="""\ +Egress shared pool occupancy per unicast queue: + Port UC0 UC1 UC2 UC3 UC4 UC5 UC6 UC7 UC8 UC9 +--------- ------- ------- ----- ----- ----- ----- ----- ----- ----- ----- +Ethernet0 3057328 3056704 0 0 0 0 0 3704 516 30 +Ethernet4 0 0 0 2986 3567 0 0 0 0 0 +Ethernet8 0 0 2040 0 0 0 0 0 9528 8696 +""" + +show_queue_wm_multicast_output="""\ +Egress shared pool occupancy per multicast queue: + Port MC10 MC11 MC12 MC13 MC14 MC15 MC16 MC17 MC18 MC19 +--------- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ +Ethernet0 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A +Ethernet4 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A +Ethernet8 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A +""" + +show_buffer_pool_wm_output="""\ +Shared pool maximum occupancy: + Pool Bytes +--------------------- ------- + egress_lossless_pool 1000 + egress_lossy_pool 2000 +ingress_lossless_pool 3000 +""" + +show_buffer_pool_persistent_wm_output="""\ +Shared pool maximum occupancy: + Pool Bytes +--------------------- ------- + egress_lossless_pool 2000 + egress_lossy_pool 3000 +ingress_lossless_pool 4000 +""" + +testData = { + 'show_pg_wm_shared' : [ {'cmd' : ['priority-group', 'watermark', 'shared'], + 'rc_output': show_pg_wm_shared_output + } + ], + 'show_pg_wm_hdrm' : [ {'cmd' : ['priority-group', 'watermark', 'headroom'], + 'rc_output': show_pg_wm_hdrm_output + } + ], + 'show_pg_pwm_shared' : [ {'cmd' : ['priority-group', 'persistent-watermark', 'shared'], + 'rc_output': show_pg_persistent_wm_shared_output + } + ], + 'show_pg_pwm_hdrm' : [ {'cmd' : ['priority-group', 'persistent-watermark', 'headroom'], + 'rc_output': show_pg_persistent_wm_hdrm_output + } + ], + 'show_q_wm_unicast' : [ {'cmd' : ['queue', 'watermark', 'unicast'], + 'rc_output': show_queue_wm_unicast_output + } + ], + 'show_q_pwm_unicast' : [ {'cmd' : ['queue', 'persistent-watermark', 'unicast'], + 'rc_output': show_queue_pwm_unicast_output + } + ], + 'show_q_wm_multicast' : [ {'cmd' : ['queue', 'watermark', 'multicast'], + 'rc_output': show_queue_wm_multicast_output + } + ], + 'show_q_pwm_multicast' : [ {'cmd' : ['queue', 'persistent-watermark', 'multicast'], + 'rc_output': show_queue_wm_multicast_output + } + ], + 'show_buffer_pool_wm' : [ {'cmd' : ['buffer_pool', 'watermark'], + 'rc_output': show_buffer_pool_wm_output + } + ], + 'show_buffer_pool_pwm' : [ {'cmd' : ['buffer_pool', 'persistent-watermark'], + 'rc_output': show_buffer_pool_persistent_wm_output + } + ] + }