JIRA: IPVSIX-29

Change-Id: Ib15a9170fa9914e44b6369d39288e293c3997245
Signed-off-by: Bin Hu <bh526r@att.com>

6 files changed, 49 insertions, 34 deletions

diff --git a/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst b/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
index 56803bf..9703991 100644
--- a/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
+++ b/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
@@ -1,23 +1,6 @@
-========================
-Preparing Infrastructure
-========================
-
-********************
-Architectural Design
-********************
-
-The architectural design of using a service VM as an IPv6 vRouter is
-shown as follows in :numref:`s2-figure1`:
-
-.. figure:: images/ipv6-architecture.png
-   :name: s2-figure1
-   :width: 100%
-
-   Architectural Design of Using a VM as an IPv6 vRouter
-
-********************
+====================
 Infrastructure Setup
-********************
+====================
 
 In order to set up the service VM as an IPv6 vRouter, we need to
 prepare 3 hosts, each of which has minimum 8GB RAM and 40GB storage. One host is used as OpenStack Controller
@@ -34,15 +17,15 @@ For exemplary purpose, we assume:
 * We use ``opnfv`` as username to login.
 * We use ``devstack`` to install OpenStack Kilo. Please note that OpenStack Liberty can be used as well.
 
-The underlay network topology of those 3 hosts are shown as follows in :numref:`s2-figure2`:
+The underlay network topology of those 3 hosts are shown as follows in :numref:`s2-figure1`:
 
 .. figure:: images/ipv6-topology-scenario-2.png
-   :name: s2-figure2
+   :name: s2-figure1
    :width: 100%
 
    Underlay Network Topology - Scenario 2
 
-**Please note that the IP address shown in** :numref:`s2-figure2`
+**Please note that the IP address shown in** :numref:`s2-figure1`
 **are for exemplary purpose. You need to configure your public IP
 address connecting to Internet according to your actual network
 infrastructure. And you need to make sure the private IP address are
diff --git a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
index 2eacb60..295807a 100644
--- a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
@@ -372,15 +372,3 @@ Congratulations, you have completed the setup of using a service VM to act as an
 open innovation by any 3rd-party. Please refer to relevant sections in User's Guide for further value-added services on
 this IPv6 vRouter.
 
-********************************************************
-Sample Network Topology of this Setup through Horizon UI
-********************************************************
-
-The sample network topology of above setup is shown in Horizon UI as follows :numref:`s2-figure3`:
-
-.. figure:: images/ipv6-sample-in-horizon.png
-   :name: s2-figure3
-   :width: 100%
-
-   Sample Network Topology in Horizon UI
-
diff --git a/docs/setupservicevm/architecture-design.rst b/docs/setupservicevm/architecture-design.rst
new file mode 100644
index 0000000..61b9ad5
--- /dev/null
+++ b/docs/setupservicevm/architecture-design.rst
@@ -0,0 +1,13 @@
+====================
+Architectural Design
+====================
+
+The architectural design of using a service VM as an IPv6 vRouter is
+shown as follows in :numref:`arch-figure1`:
+
+.. figure:: images/ipv6-architecture.png
+   :name: arch-figure1
+   :width: 100%
+
+   Architectural Design of Using a VM as an IPv6 vRouter
+
diff --git a/docs/setupservicevm/images/odl-dlux_ipv6_poc.png b/docs/setupservicevm/images/odl-dlux_ipv6_poc.png
new file mode 100644
index 0000000..a9e5df0
--- /dev/null
+++ b/docs/setupservicevm/images/odl-dlux_ipv6_poc.png
diff --git a/docs/setupservicevm/index.rst b/docs/setupservicevm/index.rst
index e9e7f8f..0ea59a9 100644
--- a/docs/setupservicevm/index.rst
+++ b/docs/setupservicevm/index.rst
@@ -27,5 +27,7 @@ environment. There are three scenarios.
    :numbered:
    :maxdepth: 4
 
+   architecture-design.rst
    5-ipv6-configguide-scenario-1-native-os.rst
    scenario-2.rst
+   topology-after-setup.rst
diff --git a/docs/setupservicevm/topology-after-setup.rst b/docs/setupservicevm/topology-after-setup.rst
new file mode 100644
index 0000000..335bab6
--- /dev/null
+++ b/docs/setupservicevm/topology-after-setup.rst
@@ -0,0 +1,29 @@
+============================
+Network Topology After Setup
+============================
+
+********************************************************
+Sample Network Topology of this Setup through Horizon UI
+********************************************************
+
+The sample network topology of the setup will be shown in Horizon UI as follows :numref:`setup-figure1`:
+
+.. figure:: images/ipv6-sample-in-horizon.png
+   :name: setup-figure1
+   :width: 100%
+
+   Sample Network Topology in Horizon UI
+
+*********************************************************
+Sample Network Topology of this Setup through ODL DLUX UI
+*********************************************************
+
+If you set up either Scenario 2 or Scenario 3, the sample network topology of the setup
+will be shown in Open Daylight DLUX UI as follows :numref:`s23-figure1`:
+
+.. figure:: images/odl-dlux_ipv6_poc.png
+   :name: s23-figure1
+   :width: 100%
+
+   Sample Network Topology in Open Daylight DLUX UI
+