aboutsummaryrefslogtreecommitdiffstats
path: root/docs/design/architecture.rst
diff options
context:
space:
mode:
authorBrady Johnson <brady.allen.johnson@ericsson.com>2016-09-07 18:47:37 +0200
committerBrady Johnson <brady.allen.johnson@ericsson.com>2016-09-07 18:50:57 +0200
commitb19f458802d93ea37fc46aa6018b6c6c5586cca3 (patch)
tree649e57dfe4b8b6d8af8b27e40b85e9241411b37f /docs/design/architecture.rst
parent1d2bdd9241564b0e848888b7f2491afef4ecedca (diff)
Update from Brahmaputra to Colorado
- Patch Set 2 : fixed broken link Change-Id: Iec5356ad7fcce4b3125e117b6d14f31ca461bf5d Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
Diffstat (limited to 'docs/design/architecture.rst')
-rw-r--r--docs/design/architecture.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/design/architecture.rst b/docs/design/architecture.rst
index d6779e9a..679bb2f9 100644
--- a/docs/design/architecture.rst
+++ b/docs/design/architecture.rst
@@ -5,7 +5,7 @@ Architecture
------------
This section describes the architectural approach to incorporating the upstream
-OpenDaylight (ODL) SFC project into the OPNFV Brahmaputra platform.
+OpenDaylight (ODL) SFC project into the OPNFV Colorado platform.
Service Functions
+++++++++++++++++
@@ -97,7 +97,7 @@ sequence diagram details the interactions with the VNF Mgr:
OPNFV SFC Network Topology
++++++++++++++++++++++++++
-The following image details the Network Topology used in OPNFV Brahmaputra SFC:
+The following image details the Network Topology used in OPNFV Colorado SFC:
.. image:: ./images/OPNFV_SFC_Brahmaputra_NW_Topology.jpg
@@ -113,7 +113,7 @@ bridge. There is work ongoing in the upstream OVS community to implemement NSH
encapsulation. To get around the way OpenStack handles VXLAN tunnels, the OVS
work will also include the ability to encapsulate/decapsulate VXLAN tunnels from
OpenFlow rules, instead of relying on the Vtep ports. The ongoing upstream OVS
-work will probably not be finished by the time OPNFV Brahmaputra is released, so
+work will not be finished by the time OPNFV Colorado is released, so
a work-around has been created. This work-around will use a private branch of
OVS that has a preliminary version of NSH implemented.