JIRA:IPVSIX-29 updated gap analysis with Liberty and Beryllium (official OPNFV B Release components)

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

4 files changed, 177 insertions, 189 deletions

diff --git a/docs/gapanalysis/gap-analysis-odl-lithium.rst b/docs/gapanalysis/gap-analysis-odl-lithium.rst
index 189d7a5..e77e7cc 100644
--- a/docs/gapanalysis/gap-analysis-odl-lithium.rst
+++ b/docs/gapanalysis/gap-analysis-odl-lithium.rst
@@ -2,60 +2,56 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) Bin Hu (AT&T) and Sridhar Gaddam (RedHat)
 
-============================================
-IPv6 Gap Analysis with Open Daylight Lithium
-============================================
+==============================================
+IPv6 Gap Analysis with Open Daylight Beryllium
+==============================================
 
 This section provides users with IPv6 gap analysis regarding feature requirement with
-Open Daylight Lithium Official Release. The following table lists the use cases / feature
+Open Daylight Beryllium Official Release. The following table lists the use cases / feature
 requirements of VIM-agnostic IPv6 functionality, including infrastructure layer and VNF
-(VM) layer, and its gap analysis with Open Daylight Lithium Official Release.
+(VM) layer, and its gap analysis with Open Daylight Beryllium Official Release.
 
 .. table::
   :class: longtable
 
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Use Case / Requirement                                       |Supported in ODL Lithium|Notes                                                                           |
-  +=============================================================+========================+================================================================================+
-  |REST API support for IPv6 subnet creation in ODL             |Yes                     |Yes, it is possible to create IPv6 subnets in ODL using Neutron REST API.       |
-  |                                                             |                        |                                                                                |
-  |                                                             |                        |For a network which has both IPv4 and IPv6 subnets, ODL mechanism driver        |
-  |                                                             |                        |will send the port information which includes IPv4/v6 addresses to ODL          |
-  |                                                             |                        |Neutron northbound API. When port information is queried it displays IPv4       |
-  |                                                             |                        |and IPv6 addresses. However, in Lithium release, ODL net-virt provider          |
-  |                                                             |                        |does not support IPv6 features (i.e., the actual functionality is missing       |
-  |                                                             |                        |and would be available only in the later releases of ODL).                      |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPv6 Router support in ODL                                   |**No**                  |ODL net-virt provider in Lithium release only supports IPv4 Router.             |
-  |                                                             |                        |Support for IPv6 Router is planned in later releases using ``Routing Manager``. |
-  |1. Communication between VMs on same compute node            |                        |In the meantime, if IPv6 Routing is necessary, we can use ODL for L2            |
-  |2. Communication between VMs on different compute nodes      |                        |connectivity and Neutron L3 agent for IPv4/v6 routing.                          |
-  |   (east-west)                                               |                        |                                                                                |
-  |3. External routing (north-south)                            |                        |**Note**: In Lithium SR3 release, we have the following `issue                  |
-  |                                                             |                        |<http://lists.opendaylight.org/pipermail/ovsdb-dev/2015-November/002288.html>`_,|
-  |                                                             |                        |which is fixed `upstream <http://git.opendaylight.org/gerrit/#/c/30253/4>`_     |
-  |                                                             |                        |and `back-ported <http://git.opendaylight.org/gerrit/#/c/30474>`_ to            |
-  |                                                             |                        |``stable/lithium`` branch on December 15th, 2015.                               |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPAM: Support for IPv6 Address assignment modes.             |**No**                  |Although it is possible to create different types of IPv6 subnets in ODL,       |
-  |                                                             |                        |ODL_L3 would have to implement the IPv6 Router that can send out Router         |
-  |1. SLAAC                                                     |                        |Advertisements based on the IPv6 addressing mode. Router Advertisement          |
-  |2. DHCPv6 Stateless                                          |                        |is also necessary for VMs to configure the default route.                       |
-  |3. DHCPv6 Stateful                                           |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |When using ODL for L2 forwarding/tunneling, is it compatible |Yes                     |                                                                                |
-  |with IPv6.                                                   |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Full support for IPv6 matching (i.e., IPv6, ICMPv6, TCP, UDP)|**No**                  |Security Groups for IPv6 are currently not supported.                           |
-  |in security groups. Ability to control and manage all IPv6   |                        |                                                                                |
-  |security group capabilities via Neutron/Nova API (REST and   |                        |                                                                                |
-  |CLI) as well as via Horizon.                                 |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Shared Networks support                                      |**No**                  |ODL currently assumes a single tenant to network mapping and does not           |
-  |                                                             |                        |support shared networks among tenants.                                          |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPv6 external L2 VLAN directly attached to a VM.             |**ToDo**                |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |ODL on an IPv6 only Infrastructure.                          |**ToDo**                |Deploying OpenStack with ODL on an IPv6 only infrastructure where the API       |
-  |                                                             |                        |endpoints are all IPv6 addresses.                                               |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Use Case / Requirement                                       |Supported in ODL Beryllium|Notes                                                                     |
+  +=============================================================+==========================+==========================================================================+
+  |REST API support for IPv6 subnet creation in ODL             |Yes                       |Yes, it is possible to create IPv6 subnets in ODL using Neutron REST API. |
+  |                                                             |                          |                                                                          |
+  |                                                             |                          |For a network which has both IPv4 and IPv6 subnets, ODL mechanism driver  |
+  |                                                             |                          |will send the port information which includes IPv4/v6 addresses to ODL    |
+  |                                                             |                          |Neutron northbound API. When port information is queried it displays IPv4 |
+  |                                                             |                          |and IPv6 addresses. However, in Beryllium release, ODL net-virt provider  |
+  |                                                             |                          |does not support IPv6 features (i.e., the actual functionality is missing |
+  |                                                             |                          |and would be available only in the later releases of ODL).                |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPv6 Router support in ODL                                   |**No**                    |ODL net-virt provider in Beryllium release only supports IPv4 Router.     |
+  |                                                             |                          |                                                                          |
+  |1. Communication between VMs on same compute node            |                          |In the meantime, if IPv6 Routing is necessary, we can use ODL for L2      |
+  |2. Communication between VMs on different compute nodes      |                          |connectivity and Neutron L3 agent for IPv4/v6 routing.                    |
+  |   (east-west)                                               |                          |                                                                          |
+  |3. External routing (north-south)                            |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPAM: Support for IPv6 Address assignment modes.             |**No**                    |Although it is possible to create different types of IPv6 subnets in ODL, |
+  |                                                             |                          |ODL_L3 would have to implement the IPv6 Router that can send out Router   |
+  |1. SLAAC                                                     |                          |Advertisements based on the IPv6 addressing mode. Router Advertisement    |
+  |2. DHCPv6 Stateless                                          |                          |is also necessary for VMs to configure the default route.                 |
+  |3. DHCPv6 Stateful                                           |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |When using ODL for L2 forwarding/tunneling, it is compatible |Yes                       |                                                                          |
+  |with IPv6.                                                   |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Full support for IPv6 matching (i.e., IPv6, ICMPv6, TCP, UDP)|**No**                    |Security Groups for IPv6 is a work in progress.                           |
+  |in security groups. Ability to control and manage all IPv6   |                          |                                                                          |
+  |security group capabilities via Neutron/Nova API (REST and   |                          |                                                                          |
+  |CLI) as well as via Horizon.                                 |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Shared Networks support                                      |**No**                    |ODL currently assumes a single tenant to network mapping and does not     |
+  |                                                             |                          |support shared networks among tenants.                                    |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPv6 external L2 VLAN directly attached to a VM.             |**ToDo**                  |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |ODL on an IPv6 only Infrastructure.                          |**ToDo**                  |Deploying OpenStack with ODL on an IPv6 only infrastructure where the API |
+  |                                                             |                          |endpoints are all IPv6 addresses.                                         |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
diff --git a/docs/gapanalysis/gap-analysis-openstack-kilo.rst b/docs/gapanalysis/gap-analysis-openstack-kilo.rst
index 9736cea..d8241b9 100644
--- a/docs/gapanalysis/gap-analysis-openstack-kilo.rst
+++ b/docs/gapanalysis/gap-analysis-openstack-kilo.rst
@@ -2,20 +2,20 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) Bin Hu (AT&T) and Sridhar Gaddam (RedHat)
 
-=====================================
-IPv6 Gap Analysis with OpenStack Kilo
-=====================================
+========================================
+IPv6 Gap Analysis with OpenStack Liberty
+========================================
 
 This section provides users with IPv6 gap analysis regarding feature requirement with
-OpenStack Neutron in Kilo Official Release. The following table lists the use cases / feature
+OpenStack Neutron in Liberty Official Release. The following table lists the use cases / feature
 requirements of VIM-agnostic IPv6 functionality, including infrastructure layer and VNF
-(VM) layer, and its gap analysis with OpenStack Neutron in Kilo Official Release.
+(VM) layer, and its gap analysis with OpenStack Neutron in Liberty Official Release.
 
 .. table::
   :class: longtable
 
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Use Case / Requirement                                     |Supported in Kilo Neutron|Notes                                                               |
+  |Use Case / Requirement                                     |Supported in Liberty     |Notes                                                               |
   +===========================================================+=========================+====================================================================+
   |All topologies work in a multi-tenant environment          |Yes                      |The IPv6 design is following the Neutron tenant networks model;     |
   |                                                           |                         |dnsmasq is being used inside DHCP network namespaces, while radvd   |
@@ -31,9 +31,9 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |IPv6 external L2 VLAN directly attached to a VM            |Yes                      |IPv6 provider network model; RA messages from upstream (external)   |
   |                                                           |                         |router are forwarded into the VMs                                   |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |IPv6 subnet routed via L3 agent to an external IPv6 network|                         |Configuration is enhanced in Kilo to allow easier setup of the      |
-  |                                                           |1. Yes                   |upstream gateway, without the user forced to create an IPv6 subnet  |
-  |1. Both VLAN and overlay (e.g. GRE, VXLAN) subnet attached |                         |for the external network.                                           |
+  |IPv6 subnet routed via L3 agent to an external IPv6 network|                         |Configuration is enhanced since Kilo to allow easier setup of the   |
+  |                                                           |1. Yes                   |upstream gateway, without the user being forced to create an IPv6   |
+  |1. Both VLAN and overlay (e.g. GRE, VXLAN) subnet attached |                         |subnet for the external network.                                    |
   |   to VMs;                                                 |                         |                                                                    |
   |2. Must be able to support multiple L3 agents for a given  |2. Yes                   |                                                                    |
   |   external network to support scaling (neutron scheduler  |                         |                                                                    |
@@ -68,7 +68,7 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Provide IPv6/IPv4 feature parity in support for            |**To-Do**                |The L3 configuration should be transparent for the SR-IOV           |
   |pass-through capabilities (e.g., SR-IOV).                  |                         |implementation. SR-IOV networking support introduced in Juno based  |
   |                                                           |                         |on the ``sriovnicswitch`` ML2 driver is expected to work with IPv4  |
-  |                                                           |                         |and IPv6 enabled VMs. We need to verify if it works or not          |
+  |                                                           |                         |and IPv6 enabled VMs. We need to verify if it works or not.         |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |Additional IPv6 extensions, for example: IPSEC, IPv6       |**No**                   |It does not appear to be considered yet (lack of clear requirements)|
   |Anycast, Multicast                                         |                         |                                                                    |
@@ -93,7 +93,7 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Security groups anti-spoofing: Prevent VM from using a     |Yes                      |                                                                    |
   |source IPv6/MAC address which is not assigned to the VM    |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Protect tenant and provider network from rough RAs         |Yes                      |When using a tenant network, Neutron is going to automatically      |
+  |Protect tenant and provider network from rogue RAs         |Yes                      |When using a tenant network, Neutron is going to automatically      |
   |                                                           |                         |handle the filter rules to allow connectivity of RAs to the VMs only|
   |                                                           |                         |from the Neutron router port; with provider networks, users are     |
   |                                                           |                         |required to specify the LLA of the upstream router during the subnet|
@@ -107,11 +107,11 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Ability for a VM to support a mix of multiple IPv4 and IPv6|Yes                      |                                                                    |
   |networks, including multiples of the same type.            |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Support for IPv6 Prefix Delegation.                        |**Roadmap**              |Some partial support is available in Liberty release                |
+  |Support for IPv6 Prefix Delegation.                        |Yes                      |Partial support in Liberty                                          |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |Distributed Virtual Routing (DVR) support for IPv6         |**No**                   |Blueprint proposed upstream, pending discussion.                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |IPv6 First-Hop Security, IPv6 ND spoofing.                 |**Roadmap**              |Supported in Liberty release                                        |
+  |IPv6 First-Hop Security, IPv6 ND spoofing                  |Yes                      |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |IPv6 support in Neutron Layer3 High Availability           |Yes                      |                                                                    |
   |(keepalived+VRRP).                                         |                         |                                                                    |
diff --git a/docs/proofread/index.rst b/docs/proofread/index.rst
index d37fadb..ad1c863 100644
--- a/docs/proofread/index.rst
+++ b/docs/proofread/index.rst
@@ -7,24 +7,24 @@ Using IPv6 Feature of Brahmaputra Release
 =========================================
 
 This section provides the users with gap analysis regarding IPv6 feature requirements with
-OpenStack Kilo Official Release and Open Daylight Lithium Official Release. The gap analysis
+OpenStack Liberty Official Release and Open Daylight Beryllium Official Release. The gap analysis
 serves as feature specific user guides and references when as a user you may leverage the
 IPv6 feature in the platform and need to perform some IPv6 related operations.
 
-*************************************
-IPv6 Gap Analysis with OpenStack Kilo
-*************************************
+****************************************
+IPv6 Gap Analysis with OpenStack Liberty
+****************************************
 
 This section provides users with IPv6 gap analysis regarding feature requirement with
-OpenStack Neutron in Kilo Official Release. The following table lists the use cases / feature
+OpenStack Neutron in Liberty Official Release. The following table lists the use cases / feature
 requirements of VIM-agnostic IPv6 functionality, including infrastructure layer and VNF
-(VM) layer, and its gap analysis with OpenStack Neutron in Kilo Official Release.
+(VM) layer, and its gap analysis with OpenStack Neutron in Liberty Official Release.
 
 .. table::
   :class: longtable
 
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Use Case / Requirement                                     |Supported in Kilo Neutron|Notes                                                               |
+  |Use Case / Requirement                                     |Supported in Liberty     |Notes                                                               |
   +===========================================================+=========================+====================================================================+
   |All topologies work in a multi-tenant environment          |Yes                      |The IPv6 design is following the Neutron tenant networks model;     |
   |                                                           |                         |dnsmasq is being used inside DHCP network namespaces, while radvd   |
@@ -40,9 +40,9 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |IPv6 external L2 VLAN directly attached to a VM            |Yes                      |IPv6 provider network model; RA messages from upstream (external)   |
   |                                                           |                         |router are forwarded into the VMs                                   |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |IPv6 subnet routed via L3 agent to an external IPv6 network|                         |Configuration is enhanced in Kilo to allow easier setup of the      |
-  |                                                           |1. Yes                   |upstream gateway, without the user forced to create an IPv6 subnet  |
-  |1. Both VLAN and overlay (e.g. GRE, VXLAN) subnet attached |                         |for the external network.                                           |
+  |IPv6 subnet routed via L3 agent to an external IPv6 network|                         |Configuration is enhanced since Kilo to allow easier setup of the   |
+  |                                                           |1. Yes                   |upstream gateway, without the user being forced to create an IPv6   |
+  |1. Both VLAN and overlay (e.g. GRE, VXLAN) subnet attached |                         |subnet for the external network.                                    |
   |   to VMs;                                                 |                         |                                                                    |
   |2. Must be able to support multiple L3 agents for a given  |2. Yes                   |                                                                    |
   |   external network to support scaling (neutron scheduler  |                         |                                                                    |
@@ -102,7 +102,7 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Security groups anti-spoofing: Prevent VM from using a     |Yes                      |                                                                    |
   |source IPv6/MAC address which is not assigned to the VM    |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Protect tenant and provider network from rough RAs         |Yes                      |When using a tenant network, Neutron is going to automatically      |
+  |Protect tenant and provider network from rogue RAs         |Yes                      |When using a tenant network, Neutron is going to automatically      |
   |                                                           |                         |handle the filter rules to allow connectivity of RAs to the VMs only|
   |                                                           |                         |from the Neutron router port; with provider networks, users are     |
   |                                                           |                         |required to specify the LLA of the upstream router during the subnet|
@@ -116,71 +116,67 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Ability for a VM to support a mix of multiple IPv4 and IPv6|Yes                      |                                                                    |
   |networks, including multiples of the same type.            |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Support for IPv6 Prefix Delegation.                        |**Roadmap**              |Some partial support is available in Liberty release                |
+  |Support for IPv6 Prefix Delegation.                        |Yes                      |Partial support in Liberty                                          |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |Distributed Virtual Routing (DVR) support for IPv6         |**No**                   |Blueprint proposed upstream, pending discussion.                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |IPv6 First-Hop Security, IPv6 ND spoofing.                 |**Roadmap**              |Supported in Liberty release                                        |
+  |IPv6 First-Hop Security, IPv6 ND spoofing                  |Yes                      |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |IPv6 support in Neutron Layer3 High Availability           |Yes                      |                                                                    |
   |(keepalived+VRRP).                                         |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
 
-********************************************
-IPv6 Gap Analysis with Open Daylight Lithium
-********************************************
+**********************************************
+IPv6 Gap Analysis with Open Daylight Beryllium
+**********************************************
 
 This section provides users with IPv6 gap analysis regarding feature requirement with
-Open Daylight Lithium Official Release. The following table lists the use cases / feature
+Open Daylight Beryllium Official Release. The following table lists the use cases / feature
 requirements of VIM-agnostic IPv6 functionality, including infrastructure layer and VNF
-(VM) layer, and its gap analysis with Open Daylight Lithium Official Release.
+(VM) layer, and its gap analysis with Open Daylight Beryllium Official Release.
 
 .. table::
   :class: longtable
 
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Use Case / Requirement                                       |Supported in ODL Lithium|Notes                                                                           |
-  +=============================================================+========================+================================================================================+
-  |REST API support for IPv6 subnet creation in ODL             |Yes                     |Yes, it is possible to create IPv6 subnets in ODL using Neutron REST API.       |
-  |                                                             |                        |                                                                                |
-  |                                                             |                        |For a network which has both IPv4 and IPv6 subnets, ODL mechanism driver        |
-  |                                                             |                        |will send the port information which includes IPv4/v6 addresses to ODL          |
-  |                                                             |                        |Neutron northbound API. When port information is queried it displays IPv4       |
-  |                                                             |                        |and IPv6 addresses. However, in Lithium release, ODL net-virt provider          |
-  |                                                             |                        |does not support IPv6 features (i.e., the actual functionality is missing       |
-  |                                                             |                        |and would be available only in the later releases of ODL).                      |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPv6 Router support in ODL                                   |**No**                  |ODL net-virt provider in Lithium release only supports IPv4 Router.             |
-  |                                                             |                        |Support for IPv6 Router is planned in later releases using ``Routing Manager``. |
-  |1. Communication between VMs on same compute node            |                        |In the meantime, if IPv6 Routing is necessary, we can use ODL for L2            |
-  |2. Communication between VMs on different compute nodes      |                        |connectivity and Neutron L3 agent for IPv4/v6 routing.                          |
-  |   (east-west)                                               |                        |                                                                                |
-  |3. External routing (north-south)                            |                        |**Note**: In Lithium SR3 release, we have the following `issue                  |
-  |                                                             |                        |<http://lists.opendaylight.org/pipermail/ovsdb-dev/2015-November/002288.html>`_,|
-  |                                                             |                        |which is fixed `upstream <http://git.opendaylight.org/gerrit/#/c/30253/4>`_     |
-  |                                                             |                        |and `back-ported <http://git.opendaylight.org/gerrit/#/c/30474>`_ to            |
-  |                                                             |                        |``stable/lithium`` branch on December 15th, 2015.                               |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPAM: Support for IPv6 Address assignment modes.             |**No**                  |Although it is possible to create different types of IPv6 subnets in ODL,       |
-  |                                                             |                        |ODL_L3 would have to implement the IPv6 Router that can send out Router         |
-  |1. SLAAC                                                     |                        |Advertisements based on the IPv6 addressing mode. Router Advertisement          |
-  |2. DHCPv6 Stateless                                          |                        |is also necessary for VMs to configure the default route.                       |
-  |3. DHCPv6 Stateful                                           |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |When using ODL for L2 forwarding/tunneling, is it compatible |Yes                     |                                                                                |
-  |with IPv6.                                                   |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Full support for IPv6 matching (i.e., IPv6, ICMPv6, TCP, UDP)|**No**                  |Security Groups for IPv6 are currently not supported.                           |
-  |in security groups. Ability to control and manage all IPv6   |                        |                                                                                |
-  |security group capabilities via Neutron/Nova API (REST and   |                        |                                                                                |
-  |CLI) as well as via Horizon.                                 |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Shared Networks support                                      |**No**                  |ODL currently assumes a single tenant to network mapping and does not           |
-  |                                                             |                        |support shared networks among tenants.                                          |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPv6 external L2 VLAN directly attached to a VM.             |**ToDo**                |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |ODL on an IPv6 only Infrastructure.                          |**ToDo**                |Deploying OpenStack with ODL on an IPv6 only infrastructure where the API       |
-  |                                                             |                        |endpoints are all IPv6 addresses.                                               |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Use Case / Requirement                                       |Supported in ODL Beryllium|Notes                                                                     |
+  +=============================================================+==========================+==========================================================================+
+  |REST API support for IPv6 subnet creation in ODL             |Yes                       |Yes, it is possible to create IPv6 subnets in ODL using Neutron REST API. |
+  |                                                             |                          |                                                                          |
+  |                                                             |                          |For a network which has both IPv4 and IPv6 subnets, ODL mechanism driver  |
+  |                                                             |                          |will send the port information which includes IPv4/v6 addresses to ODL    |
+  |                                                             |                          |Neutron northbound API. When port information is queried it displays IPv4 |
+  |                                                             |                          |and IPv6 addresses. However, in Beryllium release, ODL net-virt provider  |
+  |                                                             |                          |does not support IPv6 features (i.e., the actual functionality is missing |
+  |                                                             |                          |and would be available only in the later releases of ODL).                |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPv6 Router support in ODL                                   |**No**                    |ODL net-virt provider in Beryllium release only supports IPv4 Router.     |
+  |                                                             |                          |                                                                          |
+  |1. Communication between VMs on same compute node            |                          |In the meantime, if IPv6 Routing is necessary, we can use ODL for L2      |
+  |2. Communication between VMs on different compute nodes      |                          |connectivity and Neutron L3 agent for IPv4/v6 routing.                    |
+  |   (east-west)                                               |                          |                                                                          |
+  |3. External routing (north-south)                            |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPAM: Support for IPv6 Address assignment modes.             |**No**                    |Although it is possible to create different types of IPv6 subnets in ODL, |
+  |                                                             |                          |ODL_L3 would have to implement the IPv6 Router that can send out Router   |
+  |1. SLAAC                                                     |                          |Advertisements based on the IPv6 addressing mode. Router Advertisement    |
+  |2. DHCPv6 Stateless                                          |                          |is also necessary for VMs to configure the default route.                 |
+  |3. DHCPv6 Stateful                                           |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |When using ODL for L2 forwarding/tunneling, it is compatible |Yes                       |                                                                          |
+  |with IPv6.                                                   |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Full support for IPv6 matching (i.e., IPv6, ICMPv6, TCP, UDP)|**No**                    |Security Groups for IPv6 is a work in progress.                           |
+  |in security groups. Ability to control and manage all IPv6   |                          |                                                                          |
+  |security group capabilities via Neutron/Nova API (REST and   |                          |                                                                          |
+  |CLI) as well as via Horizon.                                 |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Shared Networks support                                      |**No**                    |ODL currently assumes a single tenant to network mapping and does not     |
+  |                                                             |                          |support shared networks among tenants.                                    |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPv6 external L2 VLAN directly attached to a VM.             |**ToDo**                  |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |ODL on an IPv6 only Infrastructure.                          |**ToDo**                  |Deploying OpenStack with ODL on an IPv6 only infrastructure where the API |
+  |                                                             |                          |endpoints are all IPv6 addresses.                                         |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
 
diff --git a/docs/userguide/featureusage.rst b/docs/userguide/featureusage.rst
index d37fadb..ad1c863 100644
--- a/docs/userguide/featureusage.rst
+++ b/docs/userguide/featureusage.rst
@@ -7,24 +7,24 @@ Using IPv6 Feature of Brahmaputra Release
 =========================================
 
 This section provides the users with gap analysis regarding IPv6 feature requirements with
-OpenStack Kilo Official Release and Open Daylight Lithium Official Release. The gap analysis
+OpenStack Liberty Official Release and Open Daylight Beryllium Official Release. The gap analysis
 serves as feature specific user guides and references when as a user you may leverage the
 IPv6 feature in the platform and need to perform some IPv6 related operations.
 
-*************************************
-IPv6 Gap Analysis with OpenStack Kilo
-*************************************
+****************************************
+IPv6 Gap Analysis with OpenStack Liberty
+****************************************
 
 This section provides users with IPv6 gap analysis regarding feature requirement with
-OpenStack Neutron in Kilo Official Release. The following table lists the use cases / feature
+OpenStack Neutron in Liberty Official Release. The following table lists the use cases / feature
 requirements of VIM-agnostic IPv6 functionality, including infrastructure layer and VNF
-(VM) layer, and its gap analysis with OpenStack Neutron in Kilo Official Release.
+(VM) layer, and its gap analysis with OpenStack Neutron in Liberty Official Release.
 
 .. table::
   :class: longtable
 
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Use Case / Requirement                                     |Supported in Kilo Neutron|Notes                                                               |
+  |Use Case / Requirement                                     |Supported in Liberty     |Notes                                                               |
   +===========================================================+=========================+====================================================================+
   |All topologies work in a multi-tenant environment          |Yes                      |The IPv6 design is following the Neutron tenant networks model;     |
   |                                                           |                         |dnsmasq is being used inside DHCP network namespaces, while radvd   |
@@ -40,9 +40,9 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |IPv6 external L2 VLAN directly attached to a VM            |Yes                      |IPv6 provider network model; RA messages from upstream (external)   |
   |                                                           |                         |router are forwarded into the VMs                                   |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |IPv6 subnet routed via L3 agent to an external IPv6 network|                         |Configuration is enhanced in Kilo to allow easier setup of the      |
-  |                                                           |1. Yes                   |upstream gateway, without the user forced to create an IPv6 subnet  |
-  |1. Both VLAN and overlay (e.g. GRE, VXLAN) subnet attached |                         |for the external network.                                           |
+  |IPv6 subnet routed via L3 agent to an external IPv6 network|                         |Configuration is enhanced since Kilo to allow easier setup of the   |
+  |                                                           |1. Yes                   |upstream gateway, without the user being forced to create an IPv6   |
+  |1. Both VLAN and overlay (e.g. GRE, VXLAN) subnet attached |                         |subnet for the external network.                                    |
   |   to VMs;                                                 |                         |                                                                    |
   |2. Must be able to support multiple L3 agents for a given  |2. Yes                   |                                                                    |
   |   external network to support scaling (neutron scheduler  |                         |                                                                    |
@@ -102,7 +102,7 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Security groups anti-spoofing: Prevent VM from using a     |Yes                      |                                                                    |
   |source IPv6/MAC address which is not assigned to the VM    |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Protect tenant and provider network from rough RAs         |Yes                      |When using a tenant network, Neutron is going to automatically      |
+  |Protect tenant and provider network from rogue RAs         |Yes                      |When using a tenant network, Neutron is going to automatically      |
   |                                                           |                         |handle the filter rules to allow connectivity of RAs to the VMs only|
   |                                                           |                         |from the Neutron router port; with provider networks, users are     |
   |                                                           |                         |required to specify the LLA of the upstream router during the subnet|
@@ -116,71 +116,67 @@ requirements of VIM-agnostic IPv6 functionality, including infrastructure layer
   |Ability for a VM to support a mix of multiple IPv4 and IPv6|Yes                      |                                                                    |
   |networks, including multiples of the same type.            |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |Support for IPv6 Prefix Delegation.                        |**Roadmap**              |Some partial support is available in Liberty release                |
+  |Support for IPv6 Prefix Delegation.                        |Yes                      |Partial support in Liberty                                          |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |Distributed Virtual Routing (DVR) support for IPv6         |**No**                   |Blueprint proposed upstream, pending discussion.                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
-  |IPv6 First-Hop Security, IPv6 ND spoofing.                 |**Roadmap**              |Supported in Liberty release                                        |
+  |IPv6 First-Hop Security, IPv6 ND spoofing                  |Yes                      |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
   |IPv6 support in Neutron Layer3 High Availability           |Yes                      |                                                                    |
   |(keepalived+VRRP).                                         |                         |                                                                    |
   +-----------------------------------------------------------+-------------------------+--------------------------------------------------------------------+
 
-********************************************
-IPv6 Gap Analysis with Open Daylight Lithium
-********************************************
+**********************************************
+IPv6 Gap Analysis with Open Daylight Beryllium
+**********************************************
 
 This section provides users with IPv6 gap analysis regarding feature requirement with
-Open Daylight Lithium Official Release. The following table lists the use cases / feature
+Open Daylight Beryllium Official Release. The following table lists the use cases / feature
 requirements of VIM-agnostic IPv6 functionality, including infrastructure layer and VNF
-(VM) layer, and its gap analysis with Open Daylight Lithium Official Release.
+(VM) layer, and its gap analysis with Open Daylight Beryllium Official Release.
 
 .. table::
   :class: longtable
 
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Use Case / Requirement                                       |Supported in ODL Lithium|Notes                                                                           |
-  +=============================================================+========================+================================================================================+
-  |REST API support for IPv6 subnet creation in ODL             |Yes                     |Yes, it is possible to create IPv6 subnets in ODL using Neutron REST API.       |
-  |                                                             |                        |                                                                                |
-  |                                                             |                        |For a network which has both IPv4 and IPv6 subnets, ODL mechanism driver        |
-  |                                                             |                        |will send the port information which includes IPv4/v6 addresses to ODL          |
-  |                                                             |                        |Neutron northbound API. When port information is queried it displays IPv4       |
-  |                                                             |                        |and IPv6 addresses. However, in Lithium release, ODL net-virt provider          |
-  |                                                             |                        |does not support IPv6 features (i.e., the actual functionality is missing       |
-  |                                                             |                        |and would be available only in the later releases of ODL).                      |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPv6 Router support in ODL                                   |**No**                  |ODL net-virt provider in Lithium release only supports IPv4 Router.             |
-  |                                                             |                        |Support for IPv6 Router is planned in later releases using ``Routing Manager``. |
-  |1. Communication between VMs on same compute node            |                        |In the meantime, if IPv6 Routing is necessary, we can use ODL for L2            |
-  |2. Communication between VMs on different compute nodes      |                        |connectivity and Neutron L3 agent for IPv4/v6 routing.                          |
-  |   (east-west)                                               |                        |                                                                                |
-  |3. External routing (north-south)                            |                        |**Note**: In Lithium SR3 release, we have the following `issue                  |
-  |                                                             |                        |<http://lists.opendaylight.org/pipermail/ovsdb-dev/2015-November/002288.html>`_,|
-  |                                                             |                        |which is fixed `upstream <http://git.opendaylight.org/gerrit/#/c/30253/4>`_     |
-  |                                                             |                        |and `back-ported <http://git.opendaylight.org/gerrit/#/c/30474>`_ to            |
-  |                                                             |                        |``stable/lithium`` branch on December 15th, 2015.                               |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPAM: Support for IPv6 Address assignment modes.             |**No**                  |Although it is possible to create different types of IPv6 subnets in ODL,       |
-  |                                                             |                        |ODL_L3 would have to implement the IPv6 Router that can send out Router         |
-  |1. SLAAC                                                     |                        |Advertisements based on the IPv6 addressing mode. Router Advertisement          |
-  |2. DHCPv6 Stateless                                          |                        |is also necessary for VMs to configure the default route.                       |
-  |3. DHCPv6 Stateful                                           |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |When using ODL for L2 forwarding/tunneling, is it compatible |Yes                     |                                                                                |
-  |with IPv6.                                                   |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Full support for IPv6 matching (i.e., IPv6, ICMPv6, TCP, UDP)|**No**                  |Security Groups for IPv6 are currently not supported.                           |
-  |in security groups. Ability to control and manage all IPv6   |                        |                                                                                |
-  |security group capabilities via Neutron/Nova API (REST and   |                        |                                                                                |
-  |CLI) as well as via Horizon.                                 |                        |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |Shared Networks support                                      |**No**                  |ODL currently assumes a single tenant to network mapping and does not           |
-  |                                                             |                        |support shared networks among tenants.                                          |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |IPv6 external L2 VLAN directly attached to a VM.             |**ToDo**                |                                                                                |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
-  |ODL on an IPv6 only Infrastructure.                          |**ToDo**                |Deploying OpenStack with ODL on an IPv6 only infrastructure where the API       |
-  |                                                             |                        |endpoints are all IPv6 addresses.                                               |
-  +-------------------------------------------------------------+------------------------+--------------------------------------------------------------------------------+
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Use Case / Requirement                                       |Supported in ODL Beryllium|Notes                                                                     |
+  +=============================================================+==========================+==========================================================================+
+  |REST API support for IPv6 subnet creation in ODL             |Yes                       |Yes, it is possible to create IPv6 subnets in ODL using Neutron REST API. |
+  |                                                             |                          |                                                                          |
+  |                                                             |                          |For a network which has both IPv4 and IPv6 subnets, ODL mechanism driver  |
+  |                                                             |                          |will send the port information which includes IPv4/v6 addresses to ODL    |
+  |                                                             |                          |Neutron northbound API. When port information is queried it displays IPv4 |
+  |                                                             |                          |and IPv6 addresses. However, in Beryllium release, ODL net-virt provider  |
+  |                                                             |                          |does not support IPv6 features (i.e., the actual functionality is missing |
+  |                                                             |                          |and would be available only in the later releases of ODL).                |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPv6 Router support in ODL                                   |**No**                    |ODL net-virt provider in Beryllium release only supports IPv4 Router.     |
+  |                                                             |                          |                                                                          |
+  |1. Communication between VMs on same compute node            |                          |In the meantime, if IPv6 Routing is necessary, we can use ODL for L2      |
+  |2. Communication between VMs on different compute nodes      |                          |connectivity and Neutron L3 agent for IPv4/v6 routing.                    |
+  |   (east-west)                                               |                          |                                                                          |
+  |3. External routing (north-south)                            |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPAM: Support for IPv6 Address assignment modes.             |**No**                    |Although it is possible to create different types of IPv6 subnets in ODL, |
+  |                                                             |                          |ODL_L3 would have to implement the IPv6 Router that can send out Router   |
+  |1. SLAAC                                                     |                          |Advertisements based on the IPv6 addressing mode. Router Advertisement    |
+  |2. DHCPv6 Stateless                                          |                          |is also necessary for VMs to configure the default route.                 |
+  |3. DHCPv6 Stateful                                           |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |When using ODL for L2 forwarding/tunneling, it is compatible |Yes                       |                                                                          |
+  |with IPv6.                                                   |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Full support for IPv6 matching (i.e., IPv6, ICMPv6, TCP, UDP)|**No**                    |Security Groups for IPv6 is a work in progress.                           |
+  |in security groups. Ability to control and manage all IPv6   |                          |                                                                          |
+  |security group capabilities via Neutron/Nova API (REST and   |                          |                                                                          |
+  |CLI) as well as via Horizon.                                 |                          |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |Shared Networks support                                      |**No**                    |ODL currently assumes a single tenant to network mapping and does not     |
+  |                                                             |                          |support shared networks among tenants.                                    |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |IPv6 external L2 VLAN directly attached to a VM.             |**ToDo**                  |                                                                          |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+
+  |ODL on an IPv6 only Infrastructure.                          |**ToDo**                  |Deploying OpenStack with ODL on an IPv6 only infrastructure where the API |
+  |                                                             |                          |endpoints are all IPv6 addresses.                                         |
+  +-------------------------------------------------------------+--------------------------+--------------------------------------------------------------------------+