diff options
| author | Yusuke Iwase <iwase.yusuke0@gmail.com> | 2015-08-25 16:02:15 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-08-30 14:21:51 +0900 |
| commit | 2701fa129fa3fa7a8752a740c32453a424123891 (patch) | |
| tree | 622e51e7684b2c86e98ee43330767cfcbeb6d06c /doc/source | |
| parent | 9bca06c31c675f1064a45bb4ead16f73424fbaa7 (diff) | |
ofctl_v1_[23]: Convert masked match value into str
Currently, ofctl_v1_[23].py always converts metadata field into str
type for display, but does not convert pbb_isid and tunnel_id fields
even if these fields are masked.
So ofctl_v1_3.py fails to convert masked pbb_isid and tunnel_id fields.
This patch fixes to convert masked match field into str type and not
to convert non-masked field.
These changes will improve maintainability when ofctl_v1_*.py will
support new match fields.
Reported-by: Weijie Liu <wliu43@illinois.edu>
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/app/ofctl_rest.rst | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/doc/source/app/ofctl_rest.rst b/doc/source/app/ofctl_rest.rst index 65d0623a..6e90e619 100644 --- a/doc/source/app/ofctl_rest.rst +++ b/doc/source/app/ofctl_rest.rst @@ -1585,7 +1585,9 @@ Description of Match on request messages =============== ================================================== ======================================================================================================= in_port Switch input port (int) {"in_port": 7} in_phy_port Switch physical input port (int) {"in_phy_port": 5, "in_port": 3} - metadata Metadata passed between tables (string) {"metadata": "0x1212121212121212"} + metadata Metadata passed between tables (int or string) {"metadata": 12345} + + | {"metadata": "0x1212/0xffff"} dl_dst Ethernet destination address (string) {"dl_dst": "aa:bb:cc:11:22:33/00:00:00:00:ff:ff"} dl_src Ethernet source address (string) {"dl_src": "aa:bb:cc:11:22:33"} eth_dst Ethernet destination address (string) {"eth_dst": "aa:bb:cc:11:22:33/00:00:00:00:ff:ff"} @@ -1629,9 +1631,15 @@ Description of Match on request messages mpls_label MPLS label (int) {"mpls_label": 3, "eth_type": 34888} mpls_tc MPLS Traffic Class (int) {"mpls_tc": 2, "eth_type": 34888} mpls_bos MPLS BoS bit (int) {"mpls_bos": 1, "eth_type": 34888} - pbb_isid PBB I-SID (int) {"pbb_isid": 5, "eth_type": 35047} - tunnel_id Logical Port Metadata (int) {"tunnel_id": 7} - ipv6_exthdr IPv6 Extension Header pseudo-field (string) {"ipv6_exthdr": "0x40/0x1F0", "eth_type": 34525} + pbb_isid PBB I-SID (int or string) {"pbb_isid": 5, "eth_type": 35047} + + | {"pbb_isid": "0x05/0xff", "eth_type": 35047} + tunnel_id Logical Port Metadata (int or string) {"tunnel_id": 7} + + | {"tunnel_id": "0x07/0xff"} + ipv6_exthdr IPv6 Extension Header pseudo-field (int or string) {"ipv6_exthdr": 3, "eth_type": 34525} + + | {"ipv6_exthdr": "0x40/0x1F0", "eth_type": 34525} =============== ================================================== ======================================================================================================= .. NOTE:: |