ofproto-dpif: Remove tabs from output.

OVS uses spaces for indentation in source code and it makes sense for it to also use spaces for indentation in output. Spaces also consume less horizontal space in output, which often makes it easier to read. This commit transitions one part of output from tabs to spaces and updates appropriate parts of the tests to match. Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Justin Pettit <[email protected]>
blp · Jun 11, 2018 · 7be29a4 · 7be29a4
1 parent 44b8de5
commit 7be29a4
Show file tree

Hide file tree

Showing 14 changed files with 278 additions and 280 deletions.
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
@@ -5526,7 +5526,7 @@ dpif_show_backer(const struct dpif_backer *backer, struct ds *ds)
             continue;
         }
 
-        ds_put_format(ds, "\t%s:\n", ofproto->up.name);
+        ds_put_format(ds, "  %s:\n", ofproto->up.name);
 
         ports = shash_sort(&ofproto->up.port_by_name);
         for (j = 0; j < shash_count(&ofproto->up.port_by_name); j++) {
@@ -5535,7 +5535,7 @@ dpif_show_backer(const struct dpif_backer *backer, struct ds *ds)
             struct smap config;
             odp_port_t odp_port;
 
-            ds_put_format(ds, "\t\t%s %u/", netdev_get_name(ofport->netdev),
+            ds_put_format(ds, "    %s %u/", netdev_get_name(ofport->netdev),
                           ofport->ofp_port);
 
             odp_port = ofp_port_to_odp_port(ofproto, ofport->ofp_port);

diff --git a/tests/bridge.at b/tests/bridge.at
@@ -11,29 +11,29 @@ OVS_VSWITCHD_START
 add_of_ports br0 1 2
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p1 1/1: (dummy)
-		p2 2/2: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (dummy)
+    p2 2/2: (dummy)
 ])
 
 # Delete p1 from the datapath with "ovs-dpctl del-if"
 # and check that it disappeared.
 AT_CHECK([ovs-appctl dpctl/del-if dummy@ovs-dummy p1])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p2 2/2: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p2 2/2: (dummy)
 ])
 
 # Force reconfiguration and make sure that p1 got added back.
 AT_CHECK([ovs-vsctl del-port p2])
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p1 1/1: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (dummy)
 ])
 OVS_APP_EXIT_AND_WAIT([ovs-vswitchd])
 OVS_APP_EXIT_AND_WAIT([ovsdb-server])

diff --git a/tests/mcast-snooping.at b/tests/mcast-snooping.at
@@ -23,10 +23,10 @@ AT_CHECK([
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p1 1/1: (dummy)
-		p2 2/2: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (dummy)
+    p2 2/2: (dummy)
 ])
 
 ovs-appctl time/stop

diff --git a/tests/mpls-xlate.at b/tests/mpls-xlate.at
@@ -15,13 +15,13 @@ OVS_VSWITCHD_START(
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p0 1/1: (dummy)
-		p1 2/none: (patch: peer=p2)
-	br1:
-		br1 65534/101: (dummy-internal)
-		p2 1/none: (patch: peer=p1)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p0 1/1: (dummy)
+    p1 2/none: (patch: peer=p2)
+  br1:
+    br1 65534/101: (dummy-internal)
+    p2 1/none: (patch: peer=p1)
 ])
 
 dnl Setup single MPLS tags.
@@ -159,14 +159,14 @@ AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg ofproto_dpif_upcall:dbg])
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p0 1/1: (dummy)
-		p1 2/none: (patch: peer=p2)
-	br1:
-		br1 65534/101: (dummy-internal)
-		p2 1/none: (patch: peer=p1)
-		p3 3/3: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p0 1/1: (dummy)
+    p1 2/none: (patch: peer=p2)
+  br1:
+    br1 65534/101: (dummy-internal)
+    p2 1/none: (patch: peer=p1)
+    p3 3/3: (dummy)
 ])
 
 dnl MPLS PUSH + POP.

diff --git a/tests/netdev-type.at b/tests/netdev-type.at
@@ -8,9 +8,9 @@ OVS_VSWITCHD_START
 add_of_ports br0 1
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p1 1/1: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (dummy)
 ])
 #
 # Set MAC address of dummy device and check that it has been set

diff --git a/tests/nsh.at b/tests/nsh.at
@@ -629,38 +629,36 @@ AT_CHECK([
 #N3_DPPORT=$(ovs-appctl dpif/show | grep "n3 30" | sed 's|.*/\([[0-9]]*\):.*|\1|')
 
 ### Verify datapath configuration
-AT_CHECK([
-    ovs-appctl dpif/show | grep -v hit | sed 's/\t/    /g'
-], [0], [dnl
-    br-in1:
-        br-in1 65534/101: (dummy-internal)
-        n1 10/4: (dummy)
-        vxlangpe12 1020/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.2)
-        vxlangpe13 1030/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.3)
-    br-in2:
-        br-in2 65534/102: (dummy-internal)
-        n2 20/5: (dummy)
-        vxlangpe21 2010/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.1)
-        vxlangpe23 2030/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.3)
-    br-in3:
-        br-in3 65534/103: (dummy-internal)
-        n3 30/6: (dummy)
-        vxlangpe31 3010/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.1)
-        vxlangpe32 3020/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.2)
-    br-p1:
-        br-p1 65534/1: (dummy-internal)
-        p1-0 2/none: (patch: peer=p0-1)
-    br-p2:
-        br-p2 65534/2: (dummy-internal)
-        p2-0 2/none: (patch: peer=p0-2)
-    br-p3:
-        br-p3 65534/3: (dummy-internal)
-        p3-0 2/none: (patch: peer=p0-3)
-    br0:
-        br0 65534/100: (dummy-internal)
-        p0-1 10/none: (patch: peer=p1-0)
-        p0-2 20/none: (patch: peer=p2-0)
-        p0-3 30/none: (patch: peer=p3-0)
+AT_CHECK([ovs-appctl dpif/show | grep -v hit], [0], [dnl
+  br-in1:
+    br-in1 65534/101: (dummy-internal)
+    n1 10/4: (dummy)
+    vxlangpe12 1020/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.2)
+    vxlangpe13 1030/4789: (vxlan: packet_type=ptap, remote_ip=10.0.0.3)
+  br-in2:
+    br-in2 65534/102: (dummy-internal)
+    n2 20/5: (dummy)
+    vxlangpe21 2010/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.1)
+    vxlangpe23 2030/4789: (vxlan: packet_type=ptap, remote_ip=20.0.0.3)
+  br-in3:
+    br-in3 65534/103: (dummy-internal)
+    n3 30/6: (dummy)
+    vxlangpe31 3010/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.1)
+    vxlangpe32 3020/4789: (vxlan: packet_type=ptap, remote_ip=30.0.0.2)
+  br-p1:
+    br-p1 65534/1: (dummy-internal)
+    p1-0 2/none: (patch: peer=p0-1)
+  br-p2:
+    br-p2 65534/2: (dummy-internal)
+    p2-0 2/none: (patch: peer=p0-2)
+  br-p3:
+    br-p3 65534/3: (dummy-internal)
+    p3-0 2/none: (patch: peer=p0-3)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p0-1 10/none: (patch: peer=p1-0)
+    p0-2 20/none: (patch: peer=p2-0)
+    p0-3 30/none: (patch: peer=p3-0)
 ])
 
 ### Setup SFC flow configuration

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
@@ -6462,9 +6462,9 @@ OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP
 AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
 
 AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
-		br0 65534/100: (dummy-internal)
-		p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1)
-		p2 2/2: (dummy)
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (gre: key=5, local_ip=2.2.2.2, remote_ip=1.1.1.1)
+    p2 2/2: (dummy)
 ])
 
 dnl Basic
@@ -6633,13 +6633,13 @@ AT_CHECK([ovs-vsctl -- add-port int-br t1 -- set Interface t1 type=gre \
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p0 1/1: (dummy: ifindex=1010)
-	int-br:
-		int-br 65534/2: (dummy-internal)
-		t1 4/4: (gre: key=456, remote_ip=1.1.2.92)
-		vm1 5/3: (dummy: ifindex=2011)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p0 1/1: (dummy: ifindex=1010)
+  int-br:
+    int-br 65534/2: (dummy-internal)
+    t1 4/4: (gre: key=456, remote_ip=1.1.2.92)
+    vm1 5/3: (dummy: ifindex=2011)
 ])
 
 dnl set up route to 1.1.2.92 via br0 and action=normal
@@ -7728,13 +7728,13 @@ add_of_ports br1 3
 
 AT_CHECK([ovs-appctl dpif/show | sed 's/\(dummy-pmd: \).*)/\1<cleared>)/'], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:0
-	br0:
-		br0 65534/100: (dummy-internal)
-		p1 1/1: (dummy-pmd: <cleared>)
-		p2 2/2: (dummy-pmd: <cleared>)
-	br1:
-		br1 65534/101: (dummy-internal)
-		p3 3/3: (dummy)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (dummy-pmd: <cleared>)
+    p2 2/2: (dummy-pmd: <cleared>)
+  br1:
+    br1 65534/101: (dummy-internal)
+    p3 3/3: (dummy)
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
@@ -7912,14 +7912,14 @@ sleep 1  # wait for log writer
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:13 missed:2
-	br0:
-		br0 65534/100: (dummy-internal)
-		p2 2/2: (dummy)
-		pbr0 1/none: (patch: peer=pbr1)
-	br1:
-		br1 65534/101: (dummy-internal)
-		p3 3/3: (dummy)
-		pbr1 1/none: (patch: peer=pbr0)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p2 2/2: (dummy)
+    pbr0 1/none: (patch: peer=pbr1)
+  br1:
+    br1 65534/101: (dummy-internal)
+    p3 3/3: (dummy)
+    pbr1 1/none: (patch: peer=pbr0)
 ])
 
 AT_CHECK([strip_ufid < ovs-vswitchd.log | filter_flow_install | strip_used], [0], [dnl
@@ -7977,14 +7977,14 @@ OVS_WAIT_UNTIL([test `grep flow_add ovs-vswitchd.log | wc -l` -ge 1])
 
 AT_CHECK([ovs-appctl dpif/show], [0], [dnl
 dummy@ovs-dummy: hit:0 missed:1
-	br0:
-		br0 65534/100: (dummy-internal)
-		p2 2/2: (dummy)
-		pbr0 1/none: (patch: peer=pbr1)
-	br1:
-		br1 65534/101: (dummy-internal)
-		p3 3/3: (dummy)
-		pbr1 1/none: (patch: peer=pbr0)
+  br0:
+    br0 65534/100: (dummy-internal)
+    p2 2/2: (dummy)
+    pbr0 1/none: (patch: peer=pbr1)
+  br1:
+    br1 65534/101: (dummy-internal)
+    p3 3/3: (dummy)
+    pbr1 1/none: (patch: peer=pbr0)
 ])
 
 AT_CHECK([strip_ufid < ovs-vswitchd.log | filter_flow_install | strip_used], [0], [dnl

diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
@@ -2950,8 +2950,8 @@ AT_CHECK([ovs-ofctl add-flow br0 "tcp,tcp_flags=+ack-ack,action="], [1], [],
 ])
 
 AT_CHECK([ovs-appctl dpif/show | tail -n +4], [0], [dnl
-		p1 1/1: (dummy)
-		p2 2/2: (dummy)
+    p1 1/1: (dummy)
+    p2 2/2: (dummy)
 ])
 
 dnl Outbound web traffic with bare-SYN

diff --git a/tests/ovs-vswitchd.at b/tests/ovs-vswitchd.at
@@ -186,9 +186,9 @@ AT_CHECK([ovs-vsctl add-port br0 p1  -- set interface p1 type=internal])
 
 dnl ovs-vswitchd should still 'see' ovsdb change with the 'monitor' method
 AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
-		br0 65534/100: (dummy-internal)
-		p0 1/1: (dummy-internal)
-		p1 2/2: (dummy-internal)
+    br0 65534/100: (dummy-internal)
+    p0 1/1: (dummy-internal)
+    p1 2/2: (dummy-internal)
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP