Update VTN Manager adoc for Beryllium

Change-Id: I7daaebb19cb67bab71967c020bd1e1dd831b411b
Signed-off-by: Karthik.S <siva-karthik@hcl.com>

diff --git a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Flowfilters.adoc b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Flowfilters.adoc
index 1d1bfe016b4cb86aebbf56b576aa0dc92af9b5aa..7e01ca2e2e05d8ea549b3c838ada51508c907cd2 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Flowfilters.adoc
+++ b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Flowfilters.adoc
@@ -58,14 +58,6 @@ You can check the topology that you have created by executing "net" command in t
 
 In this guide, you will provision flowfilters to establish communication between h1 and h3.
 
-NOTE: You need to manually add flow entries to OpenFlow switches in the Mininet. The flow entries are needed to forward packets to controller when there is a table-miss. This configuration is required only in case of OpenFlow 1.3 or using OVS versions (>2.1.1).
-
-----
-sudo ovs-ofctl add-flow s1 priority=0,actions=output:CONTROLLER
-sudo ovs-ofctl add-flow s2 priority=0,actions=output:CONTROLLER
-sudo ovs-ofctl add-flow s3 priority=0,actions=output:CONTROLLER
-----
-
 ===== Configuration
 
 To provision the virtual L2 network for the two hosts (h1 and h3), execute REST API provided by VTN Manager as follows. It uses curl command to call the REST API.

diff --git a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Service_Function_Chaining_Support.adoc b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Service_Function_Chaining_Support.adoc
index 69cf220b2fbe164555447f92e15c118443ce0741..1a1e5859b2d945426e6cc1ca3fb92f2e1f5851ed 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Service_Function_Chaining_Support.adoc
+++ b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Configure_Service_Function_Chaining_Support.adoc
@@ -49,17 +49,6 @@ sudo mn --controller=remote,ip=<Controller IP> --custom <path>\topo_handson.py -
 .Mininet Configuration
 image::vtn/Mininet_Configuration.png["Mininet Configuration",width=500]
 
-====== Install flow entries
-
-* In mininet environment, install the following flow entries to send PACKET_IN to the controller.
-
-----
- $ sudo ovs-ofctl add-flow s1 priority=0,actions=output:CONTROLLER
- $ sudo ovs-ofctl add-flow s2 priority=0,actions=output:CONTROLLER
- $ sudo ovs-ofctl add-flow s3 priority=0,actions=output:CONTROLLER
- $ sudo ovs-ofctl add-flow s4 priority=0,actions=output:CONTROLLER
-----
-
 ====== Configure service nodes
 
 * Please execute the following commands in the mininet console where mininet script is executed.

diff --git a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Create_Mac_Map_In_VTN.adoc b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Create_Mac_Map_In_VTN.adoc
index 042a4794f76444945628950e39eea39dfcd3e90e..5c58b5ac3e871dc88eca583c9853e52fd0f6e13b 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Create_Mac_Map_In_VTN.adoc
+++ b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Create_Mac_Map_In_VTN.adoc
@@ -37,16 +37,6 @@ s3 lo:  s3-eth1:s4-eth2 s3-eth2:s1-eth4 s3-eth3:srvc1-eth0 s3-eth4:srvc2-eth0
 s4 lo:  s4-eth1:s2-eth5 s4-eth2:s3-eth1 s4-eth3:srvc1-eth1 s4-eth4:srvc2-eth1
 ----
 
-NOTE:
-You need to manually add flow entries to OpenFlow switches in the Mininet. The flow entries are needed to forward packets to controller when there is a table-miss. This configuration is required only in case of OpenFlow 1.3 or using OVS versions (>2.1.1).
-
-----
-sudo ovs-ofctl add-flow s1 priority=0,actions=output:CONTROLLER
-sudo ovs-ofctl add-flow s2 priority=0,actions=output:CONTROLLER
-sudo ovs-ofctl add-flow s3 priority=0,actions=output:CONTROLLER
-sudo ovs-ofctl add-flow s4 priority=0,actions=output:CONTROLLER
-----
-
 ===== Configuration
 
 To create Mac Map in VTN, execute REST API provided by VTN Manager as follows. It uses curl command to call REST API.

diff --git a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Provision_Virtual_L2_Network.adoc b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Provision_Virtual_L2_Network.adoc
index ae508b0d5fe1910c48956aae6e056e370a31da61..a43fe04930bbaf53b1c7e17ecdad8bde4ca1aae5 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Provision_Virtual_L2_Network.adoc
+++ b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Provision_Virtual_L2_Network.adoc
@@ -4,8 +4,8 @@
 
 This page explains how to provision virtual L2 network using VTN Manager. This page targets Beryllium release, so the procedure described here does not work in other releases.
 
-.EXAMPLE DEMONSTRATING SINGLE CONTROLLER
-image::vtn/vtn-single-controller-topology-example.png[EXAMPLE DEMONSTRATING SINGLE CONTROLLER]
+.Virtual L2 network for host1 and host3
+image::vtn/How_to_provision_virtual_L2_network.png["Virtual L2 network for host1 and host3",width=500]
 
 ===== Requirements
 
@@ -38,14 +38,6 @@ Replace "192.168.0.100" with the IP address of OpenDaylight controller based on
 
 * In this guide, you will provision the virtual L2 network to establish communication between h1 and h3.
 
-* You need to manually add flow entries to OpenFlow switches in the Mininet. The flow entries are needed to forward packets to controller when there is a table-miss. This configuration is required only in case of Openflow 1.3 or using OVS version(>2.1.1).
-
-----
- sudo ovs-ofctl add-flow s1 priority=0,actions=output:CONTROLLER
- sudo ovs-ofctl add-flow s2 priority=0,actions=output:CONTROLLER
- sudo ovs-ofctl add-flow s3 priority=0,actions=output:CONTROLLER
-----
-
 ===== Configuration
 
 To provision the virtual L2 network for the two hosts (h1 and h3), execute REST API provided by VTN Manager as follows. It uses curl command to call the REST API.

diff --git a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Use_VTN_to_change_the_path_of_the_packet_flow.adoc b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Use_VTN_to_change_the_path_of_the_packet_flow.adoc
index f2d8095f41425c78be2871c729216784fbf7c532..9ac4b230dd3e1aa93c738165cab0a6757e78e9fb 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Use_VTN_to_change_the_path_of_the_packet_flow.adoc
+++ b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_Use_VTN_to_change_the_path_of_the_packet_flow.adoc
@@ -57,14 +57,6 @@ NOTE: Replace "10.106.138.124" with the IP address of OpenDaylight controller ba
  c0
 ----
 
-NOTE: You need to manually add flow entries to OpenFlow switches in the Mininet. The flow entries are needed to forward packets to controller when there is a table-miss. This configuration is required only in case of OpenFlow 1.3 or using OVS versions (>2.1.1).
-
-----
- sudo ovs-ofctl add-flow s1 priority=0,actions=output:CONTROLLER
- sudo ovs-ofctl add-flow s2 priority=0,actions=output:CONTROLLER
- sudo ovs-ofctl add-flow s3 priority=0,actions=output:CONTROLLER
-----
-
 * Generate traffic by pinging between host h1 and host h2 before creating the portmaps respectively.
 
 ----

diff --git a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_test_vlan_map_using_mininet.adoc b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_test_vlan_map_using_mininet.adoc
index b86240cff7367a819a81802c91be8705e801b557..85db1339c64611212773da5c194e5d47ac1bb19d 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_test_vlan_map_using_mininet.adoc
+++ b/manuals/user-guide/src/main/asciidoc/vtn/VTN_Manager_How_To_test_vlan_map_using_mininet.adoc
@@ -37,15 +37,6 @@ Replace "192.168.64.13" with the IP address of OpenDaylight controller based on
  c0
 ----
 
-NOTE:
-You need to manually add flow entries to OpenFlow switches in the Mininet. The flow entries are needed to forward packets to controller when there is a table-miss. This configuration is required only in case of OpenFlow 1.3 or using OVS versions (>2.1.1).
-
-----
- sudo ovs-ofctl add-flow s1 priority=0,actions=output:CONTROLLER
- sudo ovs-ofctl add-flow s2 priority=0,actions=output:CONTROLLER
- sudo ovs-ofctl add-flow s3 priority=0,actions=output:CONTROLLER
-----
-
 ===== Configuration
 
 To test vlan-map, execute REST API provided by VTN Manager as follows.

diff --git a/manuals/user-guide/src/main/resources/images/vtn/How_to_provision_virtual_L2_network.png b/manuals/user-guide/src/main/resources/images/vtn/How_to_provision_virtual_L2_network.png
new file mode 100644 (file)
index 0000000..fffd65c
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/vtn/How_to_provision_virtual_L2_network.png differ