Skip to content

Commit 58e7e87

Browse files
author
ayurkiv
committed
Fixup backmerge to 201911
1 parent ba1e633 commit 58e7e87

File tree

3 files changed

+93
-17
lines changed

3 files changed

+93
-17
lines changed

‎scripts/pg-drop

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/python
22

33
#####################################################################
44
#
55
# pg-drop is a tool for show/clear ingress pg dropped packet stats.
66
#
77
#####################################################################
8-
import _pickle as pickle
8+
import pickle
99
import argparse
1010
import os
1111
import sys
@@ -18,15 +18,15 @@ from tabulate import tabulate
1818
try:
1919
if os.environ["UTILITIES_UNIT_TESTING"] == "2":
2020
modules_path = os.path.join(os.path.dirname(__file__), "..")
21-
tests_path = os.path.join(modules_path, "tests")
21+
tests_path = os.path.join(modules_path, "sonic-utilities-tests")
2222
sys.path.insert(0, modules_path)
2323
sys.path.insert(0, tests_path)
2424
import mock_tables.dbconnector
2525

2626
except KeyError:
2727
pass
2828

29-
from swsscommon.swsscommon import SonicV2Connector
29+
from swsssdk import SonicV2Connector
3030

3131
STATUS_NA = 'N/A'
3232

@@ -56,14 +56,14 @@ class PgDropStat(object):
5656
"""
5757
port_id = self.counters_db.get(self.counters_db.COUNTERS_DB, COUNTERS_PG_PORT_MAP, oid)
5858
if port_id is None:
59-
print("Port is not available for oid '{}'".format(oid), file=sys.stderr)
59+
print "Port is not available for oid '{}'".format(oid), sys.stderr
6060
sys.exit(1)
6161
return port_id
6262

6363
# Get all ports
6464
self.counter_port_name_map = self.counters_db.get_all(self.counters_db.COUNTERS_DB, COUNTERS_PORT_NAME_MAP)
6565
if self.counter_port_name_map is None:
66-
print("COUNTERS_PORT_NAME_MAP is empty!", file=sys.stderr)
66+
print "COUNTERS_PORT_NAME_MAP is empty!", sys.stderr
6767
sys.exit(1)
6868

6969
self.port_pg_map = {}
@@ -76,7 +76,7 @@ class PgDropStat(object):
7676
# Get PGs for each port
7777
counter_pg_name_map = self.counters_db.get_all(self.counters_db.COUNTERS_DB, COUNTERS_PG_NAME_MAP)
7878
if counter_pg_name_map is None:
79-
print("COUNTERS_PG_NAME_MAP is empty!", file=sys.stderr)
79+
print "COUNTERS_PG_NAME_MAP is empty!", sys.stderr
8080
sys.exit(1)
8181

8282
for pg in counter_pg_name_map:
@@ -99,7 +99,7 @@ class PgDropStat(object):
9999
"""
100100
pg_index = self.counters_db.get(self.counters_db.COUNTERS_DB, COUNTERS_PG_INDEX_MAP, oid)
101101
if pg_index is None:
102-
print("Priority group index is not available for oid '{}'".format(table_id), file=sys.stderr)
102+
print "Priority group index is not available for oid '{}'".format(table_id), sys.stderr
103103
sys.exit(1)
104104
return pg_index
105105

@@ -108,7 +108,7 @@ class PgDropStat(object):
108108
Construct header for table with PG counters
109109
"""
110110
if pg_drop_type is None:
111-
print("Header info is not available!", file=sys.stderr)
111+
print "Header info is not available!", sys.stderr
112112
sys.exit(1)
113113

114114
self.header_list = ['Port']
@@ -163,8 +163,8 @@ class PgDropStat(object):
163163
row_data.extend(data)
164164
table.append(tuple(row_data))
165165

166-
print(type["message"])
167-
print(tabulate(table, self.header_list, tablefmt='simple', stralign='right'))
166+
print type["message"]
167+
print tabulate(table, self.header_list, tablefmt='simple', stralign='right')
168168

169169
def get_counts(self, counters, oid):
170170
"""
@@ -208,9 +208,9 @@ class PgDropStat(object):
208208
COUNTERS_PG_NAME_MAP),
209209
open(self.port_drop_stats_file, 'wb+'))
210210
except IOError as e:
211-
print(e)
211+
print e
212212
sys.exit(e.errno)
213-
print("Cleared PG drop counter")
213+
print "Cleared PG drop counter"
214214

215215
def main():
216216
parser = argparse.ArgumentParser(description='Display PG drop counter',
@@ -232,7 +232,7 @@ pg-drop -c clear
232232
try:
233233
os.makedirs(dropstat_dir)
234234
except IOError as e:
235-
print(e)
235+
print e
236236
sys.exit(e.errno)
237237

238238
pgdropstat = PgDropStat()
@@ -242,7 +242,7 @@ pg-drop -c clear
242242
elif command == 'show':
243243
pgdropstat.print_all_stat(COUNTER_TABLE_PREFIX, "pg_drop" )
244244
else:
245-
print("Command not recognized")
245+
print "Command not recognized"
246246
sys.exit(0)
247247

248248

‎sonic-utilities-tests/mock_tables/counters_db.json

+78-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@
203203
"SAI_SWITCH_STAT_OUT_DROP_REASON_RANGE_BASE": "1000",
204204
"SAI_SWITCH_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS": "0"
205205
},
206-
207206
"COUNTERS:oid:0x1a00000000034f": {
208207
"SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "800"
209208
},
@@ -276,7 +275,6 @@
276275
"COUNTERS:oid:0x1a0000000003a6" : {
277276
"SAI_INGRESS_PRIORITY_GROUP_STAT_DROPPED_PACKETS" : "107"
278277
},
279-
280278
"COUNTERS_PORT_NAME_MAP": {
281279
"Ethernet0": "oid:0x1000000000002",
282280
"Ethernet4": "oid:0x1000000000004",
@@ -287,6 +285,84 @@
287285
"Ethernet4:3": "oid:0x15000000000383",
288286
"Ethernet8:4": "oid:0x150000000003ac"
289287
},
288+
"COUNTERS_PG_NAME_MAP": {
289+
"Ethernet0:0": "oid:0x1a00000000034f",
290+
"Ethernet0:1": "oid:0x1a000000000350",
291+
"Ethernet0:2": "oid:0x1a000000000351",
292+
"Ethernet0:3": "oid:0x1a000000000352",
293+
"Ethernet0:4": "oid:0x1a000000000353",
294+
"Ethernet0:5": "oid:0x1a000000000354",
295+
"Ethernet0:6": "oid:0x1a000000000355",
296+
"Ethernet0:7": "oid:0x1a000000000356",
297+
"Ethernet4:0": "oid:0x1a000000000377",
298+
"Ethernet4:1": "oid:0x1a000000000378",
299+
"Ethernet4:2": "oid:0x1a000000000379",
300+
"Ethernet4:3": "oid:0x1a00000000037a",
301+
"Ethernet4:4": "oid:0x1a00000000037b",
302+
"Ethernet4:5": "oid:0x1a00000000037c",
303+
"Ethernet4:6": "oid:0x1a00000000037d",
304+
"Ethernet4:7": "oid:0x1a00000000037e",
305+
"Ethernet8:0": "oid:0x1a00000000039f",
306+
"Ethernet8:1": "oid:0x1a0000000003a0",
307+
"Ethernet8:2": "oid:0x1a0000000003a1",
308+
"Ethernet8:3": "oid:0x1a0000000003a2",
309+
"Ethernet8:4": "oid:0x1a0000000003a3",
310+
"Ethernet8:5": "oid:0x1a0000000003a4",
311+
"Ethernet8:6": "oid:0x1a0000000003a5",
312+
"Ethernet8:7": "oid:0x1a0000000003a6"
313+
},
314+
"COUNTERS_PG_PORT_MAP": {
315+
"oid:0x1a00000000034f": "oid:0x1000000000002",
316+
"oid:0x1a000000000350": "oid:0x1000000000002",
317+
"oid:0x1a000000000351": "oid:0x1000000000002",
318+
"oid:0x1a000000000352": "oid:0x1000000000002",
319+
"oid:0x1a000000000353": "oid:0x1000000000002",
320+
"oid:0x1a000000000354": "oid:0x1000000000002",
321+
"oid:0x1a000000000355": "oid:0x1000000000002",
322+
"oid:0x1a000000000356": "oid:0x1000000000002",
323+
"oid:0x1a000000000377": "oid:0x1000000000004",
324+
"oid:0x1a000000000378": "oid:0x1000000000004",
325+
"oid:0x1a000000000379": "oid:0x1000000000004",
326+
"oid:0x1a00000000037a": "oid:0x1000000000004",
327+
"oid:0x1a00000000037b": "oid:0x1000000000004",
328+
"oid:0x1a00000000037c": "oid:0x1000000000004",
329+
"oid:0x1a00000000037d": "oid:0x1000000000004",
330+
"oid:0x1a00000000037e": "oid:0x1000000000004",
331+
"oid:0x1a00000000039f": "oid:0x1000000000006",
332+
"oid:0x1a0000000003a0": "oid:0x1000000000006",
333+
"oid:0x1a0000000003a1": "oid:0x1000000000006",
334+
"oid:0x1a0000000003a2": "oid:0x1000000000006",
335+
"oid:0x1a0000000003a3": "oid:0x1000000000006",
336+
"oid:0x1a0000000003a4": "oid:0x1000000000006",
337+
"oid:0x1a0000000003a5": "oid:0x1000000000006",
338+
"oid:0x1a0000000003a6": "oid:0x1000000000006"
339+
},
340+
"COUNTERS_PG_INDEX_MAP": {
341+
"oid:0x1a00000000034f": "0",
342+
"oid:0x1a000000000350": "1",
343+
"oid:0x1a000000000351": "2",
344+
"oid:0x1a000000000352": "3",
345+
"oid:0x1a000000000353": "4",
346+
"oid:0x1a000000000354": "5",
347+
"oid:0x1a000000000355": "6",
348+
"oid:0x1a000000000356": "7",
349+
"oid:0x1a000000000377": "0",
350+
"oid:0x1a000000000378": "1",
351+
"oid:0x1a000000000379": "2",
352+
"oid:0x1a00000000037a": "3",
353+
"oid:0x1a00000000037b": "4",
354+
"oid:0x1a00000000037c": "5",
355+
"oid:0x1a00000000037d": "6",
356+
"oid:0x1a00000000037e": "7",
357+
"oid:0x1a00000000039f": "0",
358+
"oid:0x1a0000000003a0": "1",
359+
"oid:0x1a0000000003a1": "2",
360+
"oid:0x1a0000000003a2": "3",
361+
"oid:0x1a0000000003a3": "4",
362+
"oid:0x1a0000000003a4": "5",
363+
"oid:0x1a0000000003a5": "6",
364+
"oid:0x1a0000000003a6": "7"
365+
},
290366
"COUNTERS_DEBUG_NAME_PORT_STAT_MAP": {
291367
"DEBUG_0": "SAI_PORT_STAT_IN_DROP_REASON_RANGE_BASE",
292368
"DEBUG_2": "SAI_PORT_STAT_OUT_CONFIGURED_DROP_REASONS_1_DROPPED_PKTS"

‎tests/pgdropstat_test.py renamed to ‎sonic-utilities-tests/pgdropstat_test.py

File renamed without changes.

0 commit comments

Comments
 (0)