Merge remote-tracking branch 'origin/ovs-dev' into bsd-port

[sliver-openvswitch.git] / vswitchd / vswitch.gv

diff --git a/vswitchd/vswitch.gv b/vswitchd/vswitch.gv
index b5c2b56..210ae87 100644 (file)
--- a/vswitchd/vswitch.gv
+++ b/vswitchd/vswitch.gv
@@ -4,35 +4,31 @@ digraph Open_vSwitch {
        node [shape=box];
        edge [dir=none, arrowhead=none, arrowtail=none];
        Bridge [];
-       Bridge -> sFlow [label="sflow"];
-       Bridge -> Mirror [label="mirrors"];
-       Bridge -> Port [label="ports"];
-       Bridge -> Controller [label="controller"];
-       Bridge -> NetFlow [label="netflow"];
+       Bridge -> sFlow [label="sflow?"];
+       Bridge -> Mirror [label="mirrors*"];
+       Bridge -> Port [label="ports*"];
+       Bridge -> Controller [label="controller*"];
+       Bridge -> Flow_Table [label="flow_tables value*"];
+       Bridge -> NetFlow [label="netflow?"];
        QoS [style=bold];
-       QoS -> Queue [label="queues value"];
-       Monitor [];
-       Monitor -> Maintenance_Point [label="remote_mps"];
+       QoS -> Queue [label="queues value*"];
        sFlow [];
        Open_vSwitch [style=bold];
-       Open_vSwitch -> Bridge [label="bridges"];
-       Open_vSwitch -> Capability [label="capabilities value"];
-       Open_vSwitch -> SSL [label="ssl"];
-       Open_vSwitch -> Manager [label="manager_options"];
+       Open_vSwitch -> Bridge [label="bridges*"];
+       Open_vSwitch -> SSL [label="ssl?"];
+       Open_vSwitch -> Manager [label="manager_options*"];
        Controller [];
+       Flow_Table [];
        Queue [style=bold];
        SSL [];
        Manager [];
-       Capability [];
        Mirror [];
-       Mirror -> Port [style=dotted, constraint=false, label="select_src_port"];
-       Mirror -> Port [style=dotted, constraint=false, label="output_port"];
-       Mirror -> Port [style=dotted, constraint=false, label="select_dst_port"];
+       Mirror -> Port [style=dotted, constraint=false, label="select_src_port*"];
+       Mirror -> Port [style=dotted, constraint=false, label="output_port?"];
+       Mirror -> Port [style=dotted, constraint=false, label="select_dst_port*"];
        Interface [];
-       Interface -> Monitor [label="monitor"];
        NetFlow [];
-       Maintenance_Point [];
        Port [];
-       Port -> QoS [label="qos"];
-       Port -> Interface [label="interfaces"];
+       Port -> QoS [label="qos?"];
+       Port -> Interface [label="interfaces+"];
 }