-
Notifications
You must be signed in to change notification settings - Fork 684
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[show priority-group drop counters] Remove backup with cached PG drop…
… counters after 'config reload' (#2386) #### What I did After config reload for some period of time when COUNTERS_PG_PORT_MAP is not created yet, CLI command 'show prioriy-group counter' exits with the traceback because it expects COUNTERS_PG_PORT_MAP to be present and doesn't do proper handling for the situation when it is not yet populated. Handling was fixed #### How I did it use "not" instead of "is None" #### How to verify it UT added #### Previous command output (if the output of a command-line utility has changed) ``` root@r-lionfish-13:/home/admin# show priority-group drop counters Traceback (most recent call last): File "/usr/local/bin/pg-drop", line 262, in <module> main() File "/usr/local/bin/pg-drop", line 255, in main pgdropstat.print_all_stat(COUNTER_TABLE_PREFIX, "pg_drop" ) File "/usr/local/bin/pg-drop", line 160, in print_all_stat self.build_header(type) File "/usr/local/bin/pg-drop", line 119, in build_header single_key = list(header_map.keys())[0] IndexError: list index out of range ``` #### New command output (if the output of a command-line utility has changed) `COUNTERS_PORT_NAME_MAP is empty!`
- Loading branch information
1 parent
dffcc53
commit 14646ff
Showing
6 changed files
with
362 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
{ | ||
"COUNTERS_PORT_NAME_MAP": { | ||
}, | ||
"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_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_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" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
{ | ||
"COUNTERS_PORT_NAME_MAP": { | ||
"Ethernet0": "oid:0x1000000000012", | ||
"Ethernet4": "oid:0x1000000000013", | ||
"Ethernet8": "oid:0x1000000000014" | ||
|
||
}, | ||
"COUNTERS_PG_NAME_MAP": { | ||
}, | ||
"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_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" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
{ | ||
"COUNTERS_PORT_NAME_MAP": { | ||
"Ethernet0": "oid:0x1000000000012", | ||
"Ethernet4": "oid:0x1000000000013", | ||
"Ethernet8": "oid:0x1000000000014" | ||
}, | ||
"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_PG_PORT_MAP": { | ||
}, | ||
|
||
"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" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
{ | ||
"COUNTERS_PORT_NAME_MAP": { | ||
"Ethernet0": "oid:0x1000000000012", | ||
"Ethernet4": "oid:0x1000000000013", | ||
"Ethernet8": "oid:0x1000000000014" | ||
}, | ||
"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_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_PG_INDEX_MAP": { | ||
} | ||
} |
Oops, something went wrong.