JIRA:IPVSIX-29

Change-Id: Iacfa0eb37bcd1ce2e08306d9a8da8fb0c22d74a3
Signed-off-by: Bin Hu <bh526r@att.com>
(cherry picked from commit 4abf37b11ac5681aa293e1412c7c341b9da40e77)

3 files changed, 72 insertions, 14 deletions

diff --git a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
index 1685f68..cf70d76 100644
--- a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
@@ -364,19 +364,39 @@ interface of ``vRouter`` automatically configures an IPv6 SLAAC address.
 Testing to Verify Setup Complete
 ********************************
 
-Now, let us ``ssh`` to one of the VMs, e.g. VM1, to confirm that it has successfully configured the IPv6 address
-using ``SLAAC`` with prefix ``2001:db8:0:2::/64`` from ``vRouter``.
+Now, let us ``SSH`` to those VMs, e.g. VM1 and / or VM2 and / or vRouter, to confirm that
+it has successfully configured the IPv6 address using ``SLAAC`` with prefix
+``2001:db8:0:2::/64`` from ``vRouter``.
 
-Please note that you need to get the IPv4 address associated to VM1. This can be inferred from ``nova list`` command.
+We use ``floatingip`` mechanism to achieve ``SSH``.
 
-**SETUP-SVM-31**: ``ssh`` VM1
+**SETUP-SVM-31**: Now we can ``SSH`` to VMs. You can execute the following command.
 
 .. code-block:: bash
 
-    ssh -i /home/odl/vRouterKey cirros@<VM1-IPv4-address>
+    # 1. Create a floatingip and associate it with VM1, VM2 and vRouter (to the port id that is passed).
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth0-VM1 | \
+    awk '{print $2}') ext-net
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth0-VM2 | \
+    awk '{print $2}') ext-net
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth1-vRouter | \
+    awk '{print $2}') ext-net
 
-If everything goes well, ``ssh`` will be successful and you will be logged into VM1. Run some commands to verify
-that IPv6 addresses are configured on ``eth0`` interface.
+    # 2. To know / display the floatingip associated with VM1, VM2 and vRouter.
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth0-VM1 | awk '{print $2}') | awk '{print $2}'
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth0-VM2 | awk '{print $2}') | awk '{print $2}'
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth1-vRouter | awk '{print $2}') | awk '{print $2}'
+
+    # 3. To ssh to the vRouter, VM1 and VM2, user can execute the following command.
+    ssh -i ~/vRouterKey fedora@<floating-ip-of-vRouter>
+    ssh -i ~/vRouterKey cirros@<floating-ip-of-VM1>
+    ssh -i ~/vRouterKey cirros@<floating-ip-of-VM2>
+
+If everything goes well, ``ssh`` will be successful and you will be logged into those VMs.
+Run some commands to verify that IPv6 addresses are configured on ``eth0`` interface.
 
 **SETUP-SVM-32**: Show an IPv6 address with a prefix of ``2001:db8:0:2::/64``
 
diff --git a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
index afc064c..f7ae344 100644
--- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
+++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
@@ -330,9 +330,28 @@ to know the IPv6 addresses that would be assigned to the port).
     VM1 would have the following IPv6 address: 2001:db8:0:2:f816:3eff:fe33:3333/64
     VM2 would have the following IPv6 address: 2001:db8:0:2:f816:3eff:fe44:4444/64
 
-**OS-NATIVE-SETUP-18**: To ``SSH`` to vRouter, you can execute the following command.
+**OS-NATIVE-SETUP-18**: Now we can ``SSH`` to VMs. You can execute the following command.
 
 .. code-block:: bash
 
-    sudo ip netns exec qrouter-$(neutron router-list | grep -w ipv6-router | awk '{print $2}') ssh -i ~/vRouterKey fedora@2001:db8:0:1:f816:3eff:fe11:1111
+    # 1. Create a floatingip and associate it with VM1, VM2 and vRouter (to the port id that is passed).
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth0-VM1 | \
+    awk '{print $2}') ext-net
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth0-VM2 | \
+    awk '{print $2}') ext-net
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth1-vRouter | \
+    awk '{print $2}') ext-net
+
+    # 2. To know / display the floatingip associated with VM1, VM2 and vRouter.
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth0-VM1 | awk '{print $2}') | awk '{print $2}'
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth0-VM2 | awk '{print $2}') | awk '{print $2}'
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth1-vRouter | awk '{print $2}') | awk '{print $2}'
+
+    # 3. To ssh to the vRouter, VM1 and VM2, user can execute the following command.
+    ssh -i ~/vRouterKey fedora@<floating-ip-of-vRouter>
+    ssh -i ~/vRouterKey cirros@<floating-ip-of-VM1>
+    ssh -i ~/vRouterKey cirros@<floating-ip-of-VM2>
 
diff --git a/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst
index 076e1f6..d042687 100644
--- a/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst
@@ -195,9 +195,28 @@ to know the IPv6 addresses that would be assigned to the port).
     VM1 would have the following IPv6 address: 2001:db8:0:2:f816:3eff:fe33:3333/64
     VM2 would have the following IPv6 address: 2001:db8:0:2:f816:3eff:fe44:4444/64
 
-**SCENARIO-3-SETUP-18**: To ``SSH`` to vRouter, you can execute the following command.
-
-.. code-block:: bash
-
-    sudo ip netns exec qrouter-$(neutron router-list | grep -w ipv6-router | awk '{print $2}') ssh -i ~/vRouterKey fedora@2001:db8:0:1:f816:3eff:fe11:1111
+**SCENARIO-3-SETUP-18**: Now we can ``SSH`` to VMs. You can execute the following command.
+
+.. code-block:: bash
+
+    # 1. Create a floatingip and associate it with VM1, VM2 and vRouter (to the port id that is passed).
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth0-VM1 | \
+    awk '{print $2}') ext-net
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth0-VM2 | \
+    awk '{print $2}') ext-net
+    neutron floatingip-create --port-id $(neutron port-list | grep -w eth1-vRouter | \
+    awk '{print $2}') ext-net
+
+    # 2. To know / display the floatingip associated with VM1, VM2 and vRouter.
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth0-VM1 | awk '{print $2}') | awk '{print $2}'
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth0-VM2 | awk '{print $2}') | awk '{print $2}'
+    neutron floatingip-list -F floating_ip_address -F port_id | grep $(neutron port-list | \
+    grep -w eth1-vRouter | awk '{print $2}') | awk '{print $2}'
+
+    # 3. To ssh to the vRouter, VM1 and VM2, user can execute the following command.
+    ssh -i ~/vRouterKey fedora@<floating-ip-of-vRouter>
+    ssh -i ~/vRouterKey cirros@<floating-ip-of-VM1>
+    ssh -i ~/vRouterKey cirros@<floating-ip-of-VM2>