diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-03-26 11:22:42 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-03-27 09:17:07 -0700 |
| commit | 4000658b1a893485c163d19f50b51fbe942765e4 (patch) | |
| tree | 388e3977d3381fb19e3e832a35dde4afe73418aa /build-aux | |
| parent | e792ba50dd7c6c8344a08ecb8715624a37f0b53f (diff) | |
ofp-errors: Rename "OF" to "OF1.0+", "NX" to "NX1.0+".
This seems like a more reasonable way to do things given that we will soon
need "OpenFlow 1.1 and later" and "OpenFlow 1.1 only" keywords.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/extract-ofp-errors | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors index 24fddbbf..4b3d46ba 100755 --- a/build-aux/extract-ofp-errors +++ b/build-aux/extract-ofp-errors @@ -194,7 +194,7 @@ def extract_ofp_errors(filenames): names.append(enum) for dst in dsts.split(', '): - m = re.match(r'([A-Z0-9.]+)\((\d+)(?:,(\d+))?\)$', dst) + m = re.match(r'([A-Z0-9.+]+)\((\d+)(?:,(\d+))?\)$', dst) if not m: fatal("%s: syntax error in destination" % dst) targets = m.group(1) @@ -204,12 +204,13 @@ def extract_ofp_errors(filenames): else: code = None - target_map = {"OF": ("OF1.0", "OF1.1"), - "OF1.0": ("OF1.0",), - "OF1.1": ("OF1.1",), - "NX": ("OF1.0", "OF1.1"), - "NX1.0": ("OF1.0",), - "NX1.1": ("OF1.1",)} + target_map = {"OF1.0+": ("OF1.0", "OF1.1"), + "OF1.1+": ("OF1.1",), + "OF1.0": ("OF1.0",), + "OF1.1": ("OF1.1",), + "NX1.0+": ("OF1.0", "OF1.1"), + "NX1.0": ("OF1.0",), + "NX1.1": ("OF1.1",)} if targets not in target_map: fatal("%s: unknown error domain" % targets) for target in target_map[targets]: |