From 5a4ae6049ab5f3d7b75cfab275c3431349fe65c5 Mon Sep 17 00:00:00 2001
From: armando-migliaccio <armamig@gmail.com>
Date: Wed, 22 Jan 2014 12:40:10 -0800
Subject: [PATCH] Replace references to Nicira NVP with VMware NSX

Nicira NVP is to be replaced with VMware NSX as
the product has been rebranded.

Partial-implements blueprint nicira-plugin-renaming

Change-Id: I1dd93a52984d473ec6cc5b905867711297495f67
---
 module001-ch004-openstack-architecture.xml  |  6 +--
 module002-ch001-networking-in-openstack.xml | 55 +++++++++++----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/module001-ch004-openstack-architecture.xml b/module001-ch004-openstack-architecture.xml
index 6a8039b7..ec26a8e7 100644
--- a/module001-ch004-openstack-architecture.xml
+++ b/module001-ch004-openstack-architecture.xml
@@ -321,9 +321,9 @@
             or subnets and IP addressing. These plugins and agents
             differ depending on the vendor and technologies used in
             the particular cloud. Quantum ships with plugins and
-            agents for: Cisco virtual and physical switches, Nicira
-            NVP product, NEC OpenFlow products, Openvswitch, Linux
-            bridging and the Ryu Network Operating System.</para>
+            agents for: Cisco virtual and physical switches, NEC
+            OpenFlow products, Openvswitch, Linux bridging, the Ryu
+            Network Operating System, and VMware NSX.</para>
         </listitem>
         <listitem>
           <para>The common agents are L3 (layer 3), DHCP (dynamic host
diff --git a/module002-ch001-networking-in-openstack.xml b/module002-ch001-networking-in-openstack.xml
index c0c45a86..031a72e1 100644
--- a/module002-ch001-networking-in-openstack.xml
+++ b/module002-ch001-networking-in-openstack.xml
@@ -66,8 +66,15 @@
     <para>The current set of plugins include:</para>
     <itemizedlist>
         <listitem>
-            <para><emphasis role="bold">Open vSwitch:</emphasis>
-                Documentation included in this guide.</para>
+            <para><emphasis role="bold">Big Switch, Floodlight REST
+                    Proxy:</emphasis>
+                <link
+                    xlink:href="http://www.openflowhub.org/display/floodlightcontroller/Quantum+REST+Proxy+Plugin"
+                    >http://www.openflowhub.org/display/floodlightcontroller/Quantum+REST+Proxy+Plugin</link></para>
+        </listitem>
+        <listitem>
+            <para><emphasis role="bold">Brocade
+                Plugin</emphasis></para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">Cisco:</emphasis> Documented
@@ -75,6 +82,10 @@
                     xlink:href="http://wiki.openstack.org/cisco-quantum"
                     >http://wiki.openstack.org/cisco-quantum</link></para>
         </listitem>
+        <listitem>
+            <para><emphasis role="bold">Hyper-V
+                Plugin</emphasis></para>
+        </listitem>
         <listitem>
             <para><emphasis role="bold">Linux Bridge:</emphasis>
                 Documentation included in this guide and <link
@@ -83,18 +94,8 @@
             </para>
         </listitem>
         <listitem>
-            <para><emphasis role="bold">Nicira NVP:</emphasis>
-                Documentation include in this guide, <link
-                    xlink:href="http://www.vmware.com/products/datacenter-virtualization/nicira.html"
-                    >NVP Product Overview </link>, and <link
-                    xlink:href="http://www.nicira.com/support">NVP
-                    Product Support</link>.</para>
-        </listitem>
-        <listitem>
-            <para><emphasis role="bold">Ryu:</emphasis>
-                <link
-                    xlink:href="https://github.com/osrg/ryu/wiki/OpenStack"
-                    >https://github.com/osrg/ryu/wiki/OpenStack</link></para>
+            <para><emphasis role="bold">Midonet
+                Plugin</emphasis></para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">NEC OpenFlow:</emphasis>
@@ -103,11 +104,8 @@
                     >http://wiki.openstack.org/Quantum-NEC-OpenFlow-Plugin</link></para>
         </listitem>
         <listitem>
-            <para><emphasis role="bold">Big Switch, Floodlight REST
-                    Proxy:</emphasis>
-                <link
-                    xlink:href="http://www.openflowhub.org/display/floodlightcontroller/Quantum+REST+Proxy+Plugin"
-                    >http://www.openflowhub.org/display/floodlightcontroller/Quantum+REST+Proxy+Plugin</link></para>
+            <para><emphasis role="bold">Open vSwitch:</emphasis>
+                Documentation included in this guide.</para>
         </listitem>
         <listitem>
             <para><emphasis role="bold">PLUMgrid:</emphasis>
@@ -116,16 +114,19 @@
                     >https://wiki.openstack.org/wiki/Plumgrid-quantum</link></para>
         </listitem>
         <listitem>
-            <para><emphasis role="bold">Hyper-V
-                Plugin</emphasis></para>
+            <para><emphasis role="bold">Ryu:</emphasis>
+                <link
+                    xlink:href="https://github.com/osrg/ryu/wiki/OpenStack"
+                    >https://github.com/osrg/ryu/wiki/OpenStack</link></para>
         </listitem>
         <listitem>
-            <para><emphasis role="bold">Brocade
-                Plugin</emphasis></para>
-        </listitem>
-        <listitem>
-            <para><emphasis role="bold">Midonet
-                Plugin</emphasis></para>
+            <!-- TODO: Update support link, when available -->
+            <para><emphasis role="bold">VMware NSX:</emphasis>
+                Documentation include in this guide, <link
+                    xlink:href="http://www.vmware.com/products/nsx"
+                    >NSX Product Overview </link>, and <link
+                    xlink:href="http://www.nicira.com/support">NSX
+                    Product Support</link>.</para>
         </listitem>
     </itemizedlist>
     <para>Plugins can have different properties in terms of hardware