diff options
author | Ben Pfaff <blp@ovn.org> | 2018-05-25 17:11:07 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-06-11 15:32:00 -0700 |
commit | 5a0e4aec1af5cf7741c490bce704577e51e536b9 (patch) | |
tree | 0115e5184d50e22d6f6e7c7bd87a2690bdcc6ca4 /Documentation/tutorials | |
parent | 7be29a47576dce715f9c8b2b4f673fa623728ed0 (diff) | |
download | openvswitch-5a0e4aec1af5cf7741c490bce704577e51e536b9.tar.gz |
treewide: Convert leading tabs to spaces.
It's always been OVS coding style to use spaces rather than tabs for
indentation, but some tabs have snuck in over time. This commit converts
them to spaces.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
Diffstat (limited to 'Documentation/tutorials')
-rw-r--r-- | Documentation/tutorials/faucet.rst | 70 | ||||
-rw-r--r-- | Documentation/tutorials/ovs-advanced.rst | 98 |
2 files changed, 84 insertions, 84 deletions
diff --git a/Documentation/tutorials/faucet.rst b/Documentation/tutorials/faucet.rst index aaaffe769..9696dfd02 100644 --- a/Documentation/tutorials/faucet.rst +++ b/Documentation/tutorials/faucet.rst @@ -302,14 +302,14 @@ information, run ``man ovs-vswitchd.conf.db`` and search for ``connection_mode``):: $ ovs-vsctl add-br br0 \ - -- set bridge br0 other-config:datapath-id=0000000000000001 \ - -- add-port br0 p1 -- set interface p1 ofport_request=1 \ - -- add-port br0 p2 -- set interface p2 ofport_request=2 \ - -- add-port br0 p3 -- set interface p3 ofport_request=3 \ - -- add-port br0 p4 -- set interface p4 ofport_request=4 \ - -- add-port br0 p5 -- set interface p5 ofport_request=5 \ - -- set-controller br0 tcp:127.0.0.1:6653 \ - -- set controller br0 connection-mode=out-of-band + -- set bridge br0 other-config:datapath-id=0000000000000001 \ + -- add-port br0 p1 -- set interface p1 ofport_request=1 \ + -- add-port br0 p2 -- set interface p2 ofport_request=2 \ + -- add-port br0 p3 -- set interface p3 ofport_request=3 \ + -- add-port br0 p4 -- set interface p4 ofport_request=4 \ + -- add-port br0 p5 -- set interface p5 ofport_request=5 \ + -- set-controller br0 tcp:127.0.0.1:6653 \ + -- set controller br0 connection-mode=out-of-band .. note:: @@ -1290,40 +1290,40 @@ the ways that OVS tries to optimize megaflows. Update dps: switch-1: - dp_id: 0x1 - timeout: 3600 - arp_neighbor_timeout: 3600 - interfaces: - 1: - native_vlan: 100 - acl_in: 1 - 2: - native_vlan: 100 - 3: - native_vlan: 100 - 4: - native_vlan: 200 - 5: - native_vlan: 200 + dp_id: 0x1 + timeout: 3600 + arp_neighbor_timeout: 3600 + interfaces: + 1: + native_vlan: 100 + acl_in: 1 + 2: + native_vlan: 100 + 3: + native_vlan: 100 + 4: + native_vlan: 200 + 5: + native_vlan: 200 vlans: 100: - faucet_vips: ["10.100.0.254/24"] + faucet_vips: ["10.100.0.254/24"] 200: - faucet_vips: ["10.200.0.254/24"] + faucet_vips: ["10.200.0.254/24"] routers: router-1: - vlans: [100, 200] + vlans: [100, 200] acls: 1: - - rule: - dl_type: 0x800 - nw_proto: 6 - tcp_dst: 8080 - actions: - allow: 0 - - rule: - actions: - allow: 1 + - rule: + dl_type: 0x800 + nw_proto: 6 + tcp_dst: 8080 + actions: + allow: 0 + - rule: + actions: + allow: 1 Then restart Faucet:: diff --git a/Documentation/tutorials/ovs-advanced.rst b/Documentation/tutorials/ovs-advanced.rst index db8a53ebc..fa9fdc7bf 100644 --- a/Documentation/tutorials/ovs-advanced.rst +++ b/Documentation/tutorials/ovs-advanced.rst @@ -337,7 +337,7 @@ The output should look something like this:: bridge("br0") ------------- 0. dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0, priority 32768 - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -370,9 +370,9 @@ The output should be:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=01:80:c2:00:00:10/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -450,11 +450,11 @@ yet):: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -477,12 +477,12 @@ table 2:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=2,vlan_tci=0x0000, priority 99 - mod_vlan_vid:20 - resubmit(,2) + mod_vlan_vid:20 + resubmit(,2) 2. No match. - drop + drop Final flow: in_port=2,dl_vlan=20,dl_vlan_pcp=0,dl_src=00:00:00:00:00:00,dl_dst=00:00:00:00:00:00,dl_type=0x0000 Megaflow: recirc_id=0,in_port=2,vlan_tci=0x0000,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -503,9 +503,9 @@ The output shows the packet matching the default drop flow:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. priority 0 - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=2,vlan_tci=0x0005,dl_src=00:00:00:00:00:00/01:00:00:00:00:00,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -584,15 +584,15 @@ particular flow that was added:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=50:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=50:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] + resubmit(,3) 3. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,vlan_tci=0x0014/0x1fff,dl_src=50:00:00:00:00:01,dl_dst=00:00:00:00:00:00/ff:ff:ff:ff:ff:f0,dl_type=0x0000 @@ -694,20 +694,20 @@ table 10) that the flow's destination was unknown:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] + resubmit(,3) 3. priority 50 - resubmit(,10) - 10. No match. - drop - resubmit(,4) + resubmit(,10) + 10. No match. + drop + resubmit(,4) 4. No match. - drop + drop Final flow: unchanged Megaflow: recirc_id=0,in_port=1,dl_vlan=20,dl_src=f0:00:00:00:00:01,dl_dst=90:00:00:00:00:01,dl_type=0x0000 @@ -745,21 +745,21 @@ the learned port ``p1`` into register ``0``:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=2,vlan_tci=0x0000, priority 99 - mod_vlan_vid:20 - resubmit(,2) + mod_vlan_vid:20 + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01 priority=32768 actions=load:0x2->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01 priority=32768 actions=load:0x2->NXM_NX_REG0[0..15] + resubmit(,3) 3. priority 50 - resubmit(,10) - 10. vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01, priority 32768 - load:0x1->NXM_NX_REG0[0..15] - resubmit(,4) + resubmit(,10) + 10. vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01, priority 32768 + load:0x1->NXM_NX_REG0[0..15] + resubmit(,4) 4. No match. - drop + drop Final flow: reg0=0x1,in_port=2,dl_vlan=20,dl_vlan_pcp=0,dl_src=90:00:00:00:00:01,dl_dst=f0:00:00:00:00:01,dl_type=0x0000 Megaflow: recirc_id=0,in_port=2,vlan_tci=0x0000,dl_src=90:00:00:00:00:01,dl_dst=f0:00:00:00:00:01,dl_type=0x0000 @@ -781,20 +781,20 @@ executed in table 10, that the destination has now been learned:: bridge("br0") ------------- 0. priority 0 - resubmit(,1) + resubmit(,1) 1. in_port=1, priority 99 - resubmit(,2) + resubmit(,2) 2. priority 32768 - learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) - -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] - resubmit(,3) + learn(table=10,NXM_OF_VLAN_TCI[0..11],NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],load:NXM_OF_IN_PORT[]->NXM_NX_REG0[0..15]) + -> table=10 vlan_tci=0x0014/0x0fff,dl_dst=f0:00:00:00:00:01 priority=32768 actions=load:0x1->NXM_NX_REG0[0..15] + resubmit(,3) 3. priority 50 - resubmit(,10) - 10. vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01, priority 32768 - load:0x2->NXM_NX_REG0[0..15] - resubmit(,4) + resubmit(,10) + 10. vlan_tci=0x0014/0x0fff,dl_dst=90:00:00:00:00:01, priority 32768 + load:0x2->NXM_NX_REG0[0..15] + resubmit(,4) 4. No match. - drop + drop Implementing Table 4: Output Processing |