Merge branch 'mainstream'

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

diff --git a/vswitchd/vswitch.gv b/vswitchd/vswitch.gv
index 5988698..56d666c 100644 (file)
--- a/vswitchd/vswitch.gv
+++ b/vswitchd/vswitch.gv
@@ -3,36 +3,37 @@ digraph Open_vSwitch {
        margin="0";
        node [shape=box];
        edge [dir=none, arrowhead=none, arrowtail=none];
-       Bridge [style=bold];
-       Bridge -> sFlow [label="sflow"];
-       Bridge -> Mirror [label="mirrors"];
-       Bridge -> Port [label="ports"];
-       Bridge -> Controller [label="controller"];
-       Bridge -> NetFlow [label="netflow"];
+       Bridge [];
+       Bridge -> sFlow [label="sflow?"];
+       Bridge -> Mirror [label="mirrors*"];
+       Bridge -> IPFIX [label="ipfix?"];
+       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 [style=bold];
-       Monitor -> Maintenance_Point [label="remote_mps"];
-       sFlow [style=bold];
+       QoS -> Queue [label="queues value*"];
+       sFlow [];
+       Flow_Sample_Collector_Set [style=bold];
+       Flow_Sample_Collector_Set -> Bridge [label="bridge"];
+       Flow_Sample_Collector_Set -> IPFIX [label="ipfix?"];
+       IPFIX [];
        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"];
-       Controller [style=bold];
+       Open_vSwitch -> Bridge [label="bridges*"];
+       Open_vSwitch -> SSL [label="ssl?"];
+       Open_vSwitch -> Manager [label="manager_options*"];
+       Controller [];
+       Flow_Table [];
        Queue [style=bold];
-       SSL [style=bold];
-       Manager [style=bold];
-       Capability [style=bold];
-       Mirror [style=bold];
-       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 [style=bold];
-       Interface -> Monitor [label="monitor"];
-       NetFlow [style=bold];
-       Maintenance_Point [style=bold];
-       Port [style=bold];
-       Port -> QoS [label="qos"];
-       Port -> Interface [label="interfaces"];
+       SSL [];
+       Manager [];
+       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*"];
+       Interface [];
+       NetFlow [];
+       Port [];
+       Port -> QoS [label="qos?"];
+       Port -> Interface [label="interfaces+"];
 }