diff options
author | Ole Troan <ot@cisco.com> | 2020-10-07 18:05:37 +0200 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2020-10-13 11:42:58 +0000 |
commit | 148c7b768721231325a349fa82db693190513b53 (patch) | |
tree | 94e0a9768eda3bc4923b1b3cc727dc637d877381 /src/tools/vppapigen/vppapigen_json.py | |
parent | e7c8396982607634b4c747870499671ffa53868e (diff) |
stats: counters data model
This adds a new data model for counters.
Specifying the errors severity and unit.
A later patch will update vpp_get_stats to take advantage of this.
Only the map plugin is updates as an example.
New .api language:
A new "counters" keyword to define counter sets.
counters map {
none {
severity info;
type counter64;
units "packets";
description "valid MAP packets";
};
bad_protocol {
severity error;
type counter64;
units "packets";
description "bad protocol";
};
};
Each counter has 4 keywords. severity, which is one of error, info or warn.
A type, which is one of counter64 or gauge64.
units, which is a text field using units from YANG.
paths {
"/err/ip4-map" "map";
"/err/ip6-map" "map";
"/err/ip4-t-map" "map";
"/err/ip6-t-map" "map";
};
A new paths keyword that maps the counter-set to a path in the stats segment KV store.
Updated VPP CLI to include severity so user can see error counter severity.
DBGvpp# show errors
Count Node Reason Severity
13 ethernet-input no error error
Type: feature
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Ib2177543f49d4c3aef4d7fa72476cff2068f7771
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/tools/vppapigen/vppapigen_json.py')
-rw-r--r-- | src/tools/vppapigen/vppapigen_json.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/tools/vppapigen/vppapigen_json.py b/src/tools/vppapigen/vppapigen_json.py index 6e7aaa2e6f5..f41bfb08c58 100644 --- a/src/tools/vppapigen/vppapigen_json.py +++ b/src/tools/vppapigen/vppapigen_json.py @@ -1,6 +1,7 @@ # JSON generation import json + def walk_imports(s): r = [] for e in s: @@ -8,6 +9,19 @@ def walk_imports(s): return r +def walk_counters(s, pathset): + r = [] + for e in s: + r2 = {'name': e.name, 'elements': e.block} + r.append(r2) + + r3 = [] + for p in pathset: + r3.append(p.paths) + + return r, r3 + + def walk_enums(s): r = [] for e in s: @@ -66,6 +80,7 @@ def walk_defs(s, is_message=False): r.append(d) return r + # # Plugin entry point # @@ -84,4 +99,5 @@ def run(args, filename, s): j['aliases'] = {o.name:o.alias for o in s['types'] if o.__class__.__name__ == 'Using'} j['vl_api_version'] = hex(s['file_crc']) j['imports'] = walk_imports(i for i in s['Import']) + j['counters'], j['paths'] = walk_counters(s['Counters'], s['Paths']) return json.dumps(j, indent=4, separators=(',', ': ')) |