summaryrefslogtreecommitdiff
path: root/vswitchd
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2017-10-23 14:01:50 -0700
committerBen Pfaff <blp@ovn.org>2017-12-21 16:14:02 -0800
commit62705b81108ff6d011362331847cf0ba22494779 (patch)
tree86e2865988eb5365509b11539350d45ffff785fe /vswitchd
parent464cc3ee5094d799ddfd49cdec5727e0162483ec (diff)
downloadopenvswitch-62705b81108ff6d011362331847cf0ba22494779.tar.gz
ovs-vswitchd: Allow more convenient 0x short form for specifying DPIDs.
Until now, ovs-vswitchd has insisted that other-config:datapath-id be exactly 16 hex digits. This commit allows shorter forms prefixed by 0x. This was prompted by Faucet controller examples such as this one: https://github.com/faucetsdn/faucet/blob/master/docs/README_config.rst which tend to suggest datapath IDs like 0x1. CC: Josh Bailey <joshb@google.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'vswitchd')
-rw-r--r--vswitchd/vswitch.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 018d64435..37d04b7cf 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -882,8 +882,9 @@
</column>
<column name="other_config" key="datapath-id">
- Exactly 16 hex digits to set the OpenFlow datapath ID to a specific
- value. May not be all-zero.
+ Overrides the default OpenFlow datapath ID, setting it to the specified
+ value specified in hex. The value must either have a <code>0x</code>
+ prefix or be exactly 16 hex digits long. May not be all-zero.
</column>
<column name="other_config" key="dp-desc">