Fix two typos

Change-Id: Ia35f1a46a98914e455006b03b128f3e9a4b74adc
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
(cherry picked from commit 62610ead50f93869d84919e53b88e1e11c2ff082)

diff --git a/docs/developer-guide/service-function-chaining.rst b/docs/developer-guide/service-function-chaining.rst
index 8bddf677aaa9a733008c9e45bbbf91cbaf5dfa6d..939ac485a30447dde7dd1e1f18a96450533f5ae5 100644 (file)
--- a/docs/developer-guide/service-function-chaining.rst
+++ b/docs/developer-guide/service-function-chaining.rst
@@ -1,8 +1,8 @@
 Service Function Chaining
 =========================
 
-OpenDaylight Service Function Chaining (SFC) Overiew
-----------------------------------------------------
+OpenDaylight Service Function Chaining (SFC) Overview
+-----------------------------------------------------
 
 OpenDaylight Service Function Chaining (SFC) provides the ability to
 define an ordered list of a network services (e.g. firewalls, load

diff --git a/docs/user-guide/service-function-chaining.rst b/docs/user-guide/service-function-chaining.rst
index 1ee320f126c82d2a4f4ab0378154362d4fe50362..5fc94e69704c91b3f77123e69b432b507aadc442 100644 (file)
--- a/docs/user-guide/service-function-chaining.rst
+++ b/docs/user-guide/service-function-chaining.rst
@@ -1,8 +1,8 @@
 Service Function Chaining
 =========================
 
-OpenDaylight Service Function Chaining (SFC) Overiew
-----------------------------------------------------
+OpenDaylight Service Function Chaining (SFC) Overview
+-----------------------------------------------------
 
 OpenDaylight Service Function Chaining (SFC) provides the ability to
 define an ordered list of a network services (e.g. firewalls, load
@@ -462,18 +462,18 @@ Here are two example on SFF1: one where the RSP ingress tunnel is MPLS
 assuming VLAN is used for the SFF-SF, and the other where the RSP
 ingress tunnel is NSH GRE (UDP port 4789):
 
-+-------------+--------------------------------------+--------------------------+
-| Priority    | Match                                | Action                   |
-+=============+======================================+==========================+
-| 256         | EtherType==0x8847 (MPLS unicast)     | Goto Table 2             |
-+-------------+--------------------------------------+--------------------------+
-| 256         | EtherType==0x8100 (VLAN)             | Goto Table 2             |
-+-------------+--------------------------------------+--------------------------+
-| 256         | EtherType==0x0800,udp,tp\_dst==4789  | Goto Table 2             |
-|             | (IP v4)                              |                          |
-+-------------+--------------------------------------+--------------------------+
-| 5           | Match Any                            | Drop                     |
-+-------------+--------------------------------------+--------------------------+
++----------+-------------------------------------+--------------+
+| Priority | Match                               | Action       |
++==========+=====================================+==============+
+| 256      | EtherType==0x8847 (MPLS unicast)    | Goto Table 2 |
++----------+-------------------------------------+--------------+
+| 256      | EtherType==0x8100 (VLAN)            | Goto Table 2 |
++----------+-------------------------------------+--------------+
+| 256      | EtherType==0x0800,udp,tp\_dst==4789 | Goto Table 2 |
+|          | (IP v4)                             |              |
++----------+-------------------------------------+--------------+
+| 5        | Match Any                           | Drop         |
++----------+-------------------------------------+--------------+
 
 Table: Table Transport Ingress
 
@@ -500,23 +500,23 @@ Here is an example on SFF1, assuming the following details:
 -  The RSP Path 2 (symmetric downlink path) uses MPLS label 101 for
    ingress and 100 for egress
 
-+--------------------------+--------------------------+--------------------------+
-| Priority                 | Match                    | Action                   |
-+==========================+==========================+==========================+
-| 256                      | MPLS Label==100          | RSP Path=1, Pop MPLS,    |
-|                          |                          | Goto Table 4             |
-+--------------------------+--------------------------+--------------------------+
-| 256                      | MPLS Label==101          | RSP Path=2, Pop MPLS,    |
-|                          |                          | Goto Table 4             |
-+--------------------------+--------------------------+--------------------------+
-| 256                      | VLAN ID==1000, IP        | RSP Path=1, Pop VLAN,    |
-|                          | DSCP==1                  | Goto Table 4             |
-+--------------------------+--------------------------+--------------------------+
-| 256                      | VLAN ID==1000, IP        | RSP Path=2, Pop VLAN,    |
-|                          | DSCP==2                  | Goto Table 4             |
-+--------------------------+--------------------------+--------------------------+
-| 5                        | Match Any                | Goto Table 3             |
-+--------------------------+--------------------------+--------------------------+
++----------+-------------------+-----------------------+
+| Priority | Match             | Action                |
++==========+===================+=======================+
+| 256      | MPLS Label==100   | RSP Path=1, Pop MPLS, |
+|          |                   | Goto Table 4          |
++----------+-------------------+-----------------------+
+| 256      | MPLS Label==101   | RSP Path=2, Pop MPLS, |
+|          |                   | Goto Table 4          |
++----------+-------------------+-----------------------+
+| 256      | VLAN ID==1000, IP | RSP Path=1, Pop VLAN, |
+|          | DSCP==1           | Goto Table 4          |
++----------+-------------------+-----------------------+
+| 256      | VLAN ID==1000, IP | RSP Path=2, Pop VLAN, |
+|          | DSCP==2           | Goto Table 4          |
++----------+-------------------+-----------------------+
+| 5        | Match Any         | Goto Table 3          |
++----------+-------------------+-----------------------+
 
 Table: Table Path Mapper
 
@@ -542,31 +542,31 @@ Paths 1 and 2 are symmetric VLAN paths. RSP Paths 3 and 4 are symmetric
 NSH paths. RSP Path 1 ingress packets come from external to SFC, for
 which we don’t have the source MAC address (MacSrc).
 
-+------------+--------------------------------+--------------------------------+
-| Priority   | Match                          | Action                         |
-+============+================================+================================+
-| 256        | RSP Path==1, MacSrc==SF1       | MacDst=SFF2, Goto Table 10     |
-+------------+--------------------------------+--------------------------------+
-| 256        | RSP Path==2, MacSrc==SF1       | Goto Table 10                  |
-+------------+--------------------------------+--------------------------------+
-| 256        | RSP Path==2, MacSrc==SFF2      | MacDst=SF1, Goto Table 10      |
-+------------+--------------------------------+--------------------------------+
-| 246        | RSP Path==1                    | MacDst=SF1, Goto Table 10      |
-+------------+--------------------------------+--------------------------------+
-| 256        | nsp=3,nsi=255 (SFF Ingress RSP | load:0xa000002→NXM\_NX\_TUN\_I |
-|            | 3)                             | PV4\_DST[],                    |
-|            |                                | Goto Table 10                  |
-+------------+--------------------------------+--------------------------------+
-| 256        | nsp=3,nsi=254 (SFF Ingress     | load:0xa00000a→NXM\_NX\_TUN\_I |
-|            | from SF, RSP 3)                | PV4\_DST[],                    |
-|            |                                | Goto Table 10                  |
-+------------+--------------------------------+--------------------------------+
-| 256        | nsp=4,nsi=254 (SFF1 Ingress    | load:0xa00000a→NXM\_NX\_TUN\_I |
-|            | from SFF2)                     | PV4\_DST[],                    |
-|            |                                | Goto Table 10                  |
-+------------+--------------------------------+--------------------------------+
-| 5          | Match Any                      | Drop                           |
-+------------+--------------------------------+--------------------------------+
++----------+--------------------------------+--------------------------------+
+| Priority | Match                          | Action                         |
++==========+================================+================================+
+| 256      | RSP Path==1, MacSrc==SF1       | MacDst=SFF2, Goto Table 10     |
++----------+--------------------------------+--------------------------------+
+| 256      | RSP Path==2, MacSrc==SF1       | Goto Table 10                  |
++----------+--------------------------------+--------------------------------+
+| 256      | RSP Path==2, MacSrc==SFF2      | MacDst=SF1, Goto Table 10      |
++----------+--------------------------------+--------------------------------+
+| 246      | RSP Path==1                    | MacDst=SF1, Goto Table 10      |
++----------+--------------------------------+--------------------------------+
+| 256      | nsp=3,nsi=255 (SFF Ingress RSP | load:0xa000002→NXM\_NX\_TUN\_I |
+|          | 3)                             | PV4\_DST[],                    |
+|          |                                | Goto Table 10                  |
++----------+--------------------------------+--------------------------------+
+| 256      | nsp=3,nsi=254 (SFF Ingress     | load:0xa00000a→NXM\_NX\_TUN\_I |
+|          | from SF, RSP 3)                | PV4\_DST[],                    |
+|          |                                | Goto Table 10                  |
++----------+--------------------------------+--------------------------------+
+| 256      | nsp=4,nsi=254 (SFF1 Ingress    | load:0xa00000a→NXM\_NX\_TUN\_I |
+|          | from SFF2)                     | PV4\_DST[],                    |
+|          |                                | Goto Table 10                  |
++----------+--------------------------------+--------------------------------+
+| 5        | Match Any                      | Drop                           |
++----------+--------------------------------+--------------------------------+
 
 Table: Table Next Hop
 
@@ -581,29 +581,29 @@ paths that use VLAN for the SFF-SF. RSP Paths 3 and 4 are symmetric NSH
 paths. Since it is assumed that switches used for NSH will only have one
 VXLANport, the NSH packets are just sent back where they came from.
 
-+------------+--------------------------------+--------------------------------+
-| Priority   | Match                          | Action                         |
-+============+================================+================================+
-| 256        | RSP Path==1, MacDst==SF1       | Push VLAN ID 1000, Port=SF1    |
-+------------+--------------------------------+--------------------------------+
-| 256        | RSP Path==1, MacDst==SFF2      | Push MPLS Label 101, Port=SFF2 |
-+------------+--------------------------------+--------------------------------+
-| 256        | RSP Path==2, MacDst==SF1       | Push VLAN ID 1000, Port=SF1    |
-+------------+--------------------------------+--------------------------------+
-| 246        | RSP Path==2                    | Push MPLS Label 100,           |
-|            |                                | Port=Ingress                   |
-+------------+--------------------------------+--------------------------------+
-| 256        | nsp=3,nsi=255 (SFF Ingress RSP | IN\_PORT                       |
-|            | 3)                             |                                |
-+------------+--------------------------------+--------------------------------+
-| 256        | nsp=3,nsi=254 (SFF Ingress     | IN\_PORT                       |
-|            | from SF, RSP 3)                |                                |
-+------------+--------------------------------+--------------------------------+
-| 256        | nsp=4,nsi=254 (SFF1 Ingress    | IN\_PORT                       |
-|            | from SFF2)                     |                                |
-+------------+--------------------------------+--------------------------------+
-| 5          | Match Any                      | Drop                           |
-+------------+--------------------------------+--------------------------------+
++----------+--------------------------------+--------------------------------+
+| Priority | Match                          | Action                         |
++==========+================================+================================+
+| 256      | RSP Path==1, MacDst==SF1       | Push VLAN ID 1000, Port=SF1    |
++----------+--------------------------------+--------------------------------+
+| 256      | RSP Path==1, MacDst==SFF2      | Push MPLS Label 101, Port=SFF2 |
++----------+--------------------------------+--------------------------------+
+| 256      | RSP Path==2, MacDst==SF1       | Push VLAN ID 1000, Port=SF1    |
++----------+--------------------------------+--------------------------------+
+| 246      | RSP Path==2                    | Push MPLS Label 100,           |
+|          |                                | Port=Ingress                   |
++----------+--------------------------------+--------------------------------+
+| 256      | nsp=3,nsi=255 (SFF Ingress RSP | IN\_PORT                       |
+|          | 3)                             |                                |
++----------+--------------------------------+--------------------------------+
+| 256      | nsp=3,nsi=254 (SFF Ingress     | IN\_PORT                       |
+|          | from SF, RSP 3)                |                                |
++----------+--------------------------------+--------------------------------+
+| 256      | nsp=4,nsi=254 (SFF1 Ingress    | IN\_PORT                       |
+|          | from SFF2)                     |                                |
++----------+--------------------------------+--------------------------------+
+| 5        | Match Any                      | Drop                           |
++----------+--------------------------------+--------------------------------+
 
 Table: Table Transport Egress