ovs-ctl: Store hostname as an external-id.

Update ovs-ctl to store the system hostname as an external-id, similar
to the system-id.  This is largely for convenience.  ovn-controller
will make use of it in a future commit.  Someone in the OpenDaylight
community requested the same thing in a discussion earlier this week.

While we're at it, set external-ids:hostname in ovs-sandbox as well.

Suggested-by: Justin Pettit <jpettit@ovn.org>
Suggested-at: http://openvswitch.org/pipermail/dev/2016-March/068225.html
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>

diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index f331a001550137c96c13ebf80e1d3af477dc855a..412c98289c975deabc2eea82ac70ee46e1c4d2bb 100755 (executable)
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -356,6 +356,7 @@ rungdb $gdb_vswitchd $gdb_vswitchd_ex ovs-vswitchd --detach --no-chdir --pidfile
 
 if $ovn; then
     ovs-vsctl set open . external-ids:system-id=56b18105-5706-46ef-80c4-ff20979ab068
+    ovs-vsctl set open . external-ids:hostname=sandbox
     ovs-vsctl set open . external-ids:ovn-remote=unix:"$sandbox"/ovnsb_db.sock
     ovs-vsctl set open . external-ids:ovn-encap-type=geneve
     ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 7354a473fb75e7795120472ad10d6ab122082418..d2872ef825a446748101abd165659c754c30033c 100755 (executable)
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -108,6 +108,8 @@ set_system_ids () {
     esac
     set "$@" external-ids:system-id="\"$SYSTEM_ID\""
 
+    set "$@" external-ids:hostname="\"$(hostname)\""
+
     if test X"$SYSTEM_TYPE" != X; then
         set "$@" system-type="\"$SYSTEM_TYPE\""
     else

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 09985845adbafa384552dcecfffb45da60b50986..7d6976f2fed2c94de703c2049ef6d35374dcb9c2 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -72,6 +72,10 @@
         host as displayed by <code>xe host-list</code>.
       </column>
 
+      <column name="external_ids" key="hostname">
+        The hostname for the host running Open vSwitch.
+      </column>
+
       <column name="other_config" key="stats-update-interval"
               type='{"type": "integer", "minInteger": 5000}'>
         <p>