38 files changed, 192 insertions, 196 deletions

diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-L3-DVR-example.png b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-L3-DVR-example.png
index 18932c3..18932c3 100755
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-L3-DVR-example.png
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-L3-DVR-example.png
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-L3-noha-sample-setup.png b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-L3-noha-sample-setup.png
index 27c8335..27c8335 100755
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-L3-noha-sample-setup.png
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-L3-noha-sample-setup.png
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/FDS-basic-components.jpg b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-basic-components.jpg
index e92851f..e92851f 100755
--- a/docs/scenarios/os-odl_l2-fdio-ha/FDS-basic-components.jpg
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-basic-components.jpg
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-odl_l3-noha-overview.png b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-odl_l3-noha-overview.png
index 1193ea4..1193ea4 100755
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-odl_l3-noha-overview.png
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-odl_l3-noha-overview.png
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/FDS-simple-callflow.png b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-simple-callflow.png
index 04546aa..04546aa 100755
--- a/docs/scenarios/os-odl_l2-fdio-ha/FDS-simple-callflow.png
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/FDS-simple-callflow.png
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/index.rst b/docs/scenarios/os-odl-fdio-dvr-ha/index.rst
index a324f11..6176c7b 100644
--- a/docs/scenarios/os-odl_l2-fdio-noha/index.rst
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/index.rst
@@ -1,4 +1,4 @@
-.. _os-odl_l2-fdio-noha:
+.. _os-odl-fdio-dvr-ha:
 
 .. OPNFV - Open Platform for Network Function Virtualization
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
@@ -6,10 +6,10 @@
 
 
 ***********************************************************************
-Fast Data Stacks Scenario: os-odl_l2-fdio-noha Overview and Description
+Fast Data Stacks Scenario: os-odl-fdio-dvr-ha Overview and Description
 ***********************************************************************
 
-Scenario: "OpenStack - Opendaylight (L2) - FD.io" (apex-os-odl_l2-fdio-noha)
+Scenario: "OpenStack - Opendaylight - FD.io DVR" (apex-os-odl-fdio-dvr-ha)
 is a scenario developed as part of the FastDataStacks
 OPNFV project.
 
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/scenario.description.rst b/docs/scenarios/os-odl-fdio-dvr-ha/scenario.description.rst
index a81e8ed..15dbfd8 100755
--- a/docs/scenarios/os-odl_l2-fdio-ha/scenario.description.rst
+++ b/docs/scenarios/os-odl-fdio-dvr-ha/scenario.description.rst
@@ -2,18 +2,19 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-Scenario: "OpenStack - OpenDaylight (Layer 2) - FD.io"
+Scenario: "OpenStack - OpenDaylight - FD.io DVR"
 ======================================================
 
-Scenario: apex-os-odl_l2-fdio-ha
+Scenario: apex-os-odl-fdio-dvr-ha
 
-"apex-os-odl_l2-fdio-ha" is a scenario developed as part of the
+"apex-os-odl-fdio-dvr-ha" is a scenario developed as part of the
 FastDataStacks OPNFV project. The main components of the
-"apex-os-odl_l2-fdio-ha" scenario are:
+"apex-os-odl-fdio-dvr-ha" scenario are:
 
  - APEX (TripleO) installer (please also see APEX installer documentation)
  - Openstack (in HA configuration)
- - OpenDaylight controller in clustered mode controlling layer 2 networking
+ - OpenDaylight controller (in cluster)
+   controlling layer 2 and layer 3 networking
  - FD.io/VPP virtual forwarder for tenant networking
 
 Introduction
@@ -27,6 +28,7 @@ network topology.
 
 A solution stack is only as good as its foundation. Key foundational assets for
 NFV infrastructure are
+
   * The virtual forwarder: The virtual forwarder needs to be a feature rich,
     high performance, highly scale virtual switch-router. It needs to leverage
     hardware accelerators when available and run in user space.
@@ -41,6 +43,7 @@ NFV infrastructure are
 In order to meet the desired qualities of an NFV infrastructure, the
 following components were chosen for the "Openstack - OpenDaylight - FD.io"
 scenario:
+
   * FD.io Vector Packet Processor (VPP) - a highly scalable,
     high performance, extensible virtual forwarder
   * OpenDaylight Controller - an extensible controller platform which
@@ -48,9 +51,9 @@ scenario:
     constructs, supports a diverse set of network devices
     (virtual and physical) via the "group based policy (GBP)"
     component, and can be clustered to achieve a highly available
-    deployment - as done in this scenario.
+    deployment.
 
-The "Openstack - OpenDaylight - FD.io" scenario provides the capability to
+The "Openstack - OpenDaylight - FD.io DVR" scenario provides the capability to
 realize a set of use-cases relevant to the deployment of NFV nodes instantiated
 by means of an Openstack orchestration system on FD.io/VPP enabled compute
 nodes. The role of the Opendaylight network controller in this integration is
@@ -58,76 +61,85 @@ twofold. It provides a network device configuration and topology abstraction
 via the Openstack Neutron interface, while providing the capability to realize
 more complex network policies by means of Group Based Policies. Furthermore it
 also provides the capabilities to monitor as well as visualize the operation of
-the virtual network devices and their topologies.
-In supporting the general use-case of instantiatiting an NFV instance, two
-specific types of network transport use cases are realized:
+the virtual network devices and their topologies.  In supporting the general
+use-case of instantiatiting an NFV instance, two specific types of network
+transport use cases are realized:
 
   * NFV instances with VPP data-plane forwarding using a VLAN provider network
   * NFV instances with VPP data-plane forwarding using a VXLAN overlay
     transport network
 
-A deployment of the "apex-os-odl_l2-fdio-ha" scenario consists of 4 or more
+A deployment of the "apex-os-odl-fdio-dvr-ha" scenario consists of 4 or more
 servers:
 
   * 1 Jumphost hosting the APEX installer - running the Undercloud
-  * 3 Controlhosts, which run the Overcloud as well as OpenDaylight
-    as a network controller. OpenDaylight is deployed in clustered
-    mode and runs on all 3 control nodes.
-  * 2 or more Computehosts
-
-.. image:: FDS-odl_l2-ha-overview.png
-
-Tenant networking leverages FD.io/VPP. Open VSwitch (OVS) is used for all other
-connectivity, in particular the connectivity to public networking / the
-Internet (i.e. br-ext) is performed via OVS as in any standard OpenStack
-deployment. The OpenDaylight network controller is used to setup and manage
-layer 2 networking for the scenario. Tenant networking can either leverage
-VXLAN (in which case a full mesh of VXLAN tunnels is created) or VLANs. Layer 3
-connectivity for a tenant network is provided centrally via qrouter on the
-control node. As in a standard OpenStack deployment, the Layer3 agent
-configures the qrouter and associated rulesets for security (security groups)
-and NAT (floating IPs). Public IP network connectivity for a tenant network is
-provided by interconnecting the VPP-based bridge domain representing the tenant
-network to qrouter using a tap interface. The setup is depicted below:
-
-.. image:: FDS-L3-tenant-connectivity.png
-
-With high availability factored in the setup looks like the following.
-
-.. image:: os-odl_l2-fdio-ha-colorado2_1.png
-
-Note that the picture only shows two Controllernodes for reasons of
-simplicity. A HA deployment will always include 3 Controllernodes.
-
+  * 1 Controlhost, which runs the Overcloud as well as
+      OpenDaylight as a network controller
+  * 2 or more Computehosts. These Computehosts also serve as
+      layer 3 gateways for tenant networks.
+
+TODO: update the image:
+    1. Compute 0..N are gateways
+    2. NIC2s on controllers are not in vpp
+
+.. image:: FDS-odl_l3-noha-overview.png
+
+Tenant and public networking leverages FD.io/VPP. On compute nodes,
+VPP binds to both the tenant networking interface as well as the public
+networking interface. This means that VPP is used for communication within
+a tenant network, between tenant networks, as well as between a tenant network
+and the Internet.
+
+Note that this setup slightly differs from the usual
+centralized L3 setup with qrouter on the control node. This setup was chosen
+to limit the configuration changes for the introduction of FD.io/VPP.  The
+OpenDaylight network controller is used to setup and manage layer 2 and
+layer 3 networking for the scenario - with Group Based Policy (GBP) being the
+key component. Tenant networking can either leverage VXLAN (in which case a
+full mesh of VXLAN tunnels is created) or VLANs.
+
+The picture below shows an example setup with two compute and one control
+node. Note that the external network is connected via compute node 0 through
+VPP. VPP provides all layer 3 services which are provided in a "vanilla"
+OpenStack deployment, including SNAT and DNAT, as well as north-south
+and east-west traffic filtering for security purposes ("security groups").
+
+TODO: update the image:
+    1. Add External network interface to Computenode-1
+
+.. image:: FDS-L3-noha-sample-setup.png
 
 Features of the scenario
 ------------------------
 
-Main features of the "apex-os-odl_l2-fdio-ha" scenario:
+Main features of the "apex-os-odl-fdio-dvr-ha" scenario:
 
   * Automated installation using the APEX installer
   * Fast and scalable tenant networking using FD.io/VPP as forwarder
-  * Layer 2 networking using VLANs or VXLAN, managed and
-    controlled through OpenDaylight
-  * Layer 3 connectivitiy for tenant networks supplied centrally on
-    the Control node through standard OpenStack mechanisms.
-    All layer 3 features apply, including floating IPs (i.e. NAT)
-    and security groups.
+  * Layer 2 networking using VLANs or VXLAN, managed
+    and controlled through OpenDaylight
+  * Layer 3 connectivitiy for tenant networks supplied
+    through FD.io/VPP. Layer 3 features, including security groups as well as
+    floating IP addresses (i.e. NAT) are implemented by the FD.io/VPP forwarder
   * Manual and automatic (via DHCP) addressing on tenant networks
-  * OpenDaylight controller high availability (clustering)
-  * OpenStack high availability
 
 Scenario components and composition
 ===================================
 
-The apex-os-odl_l2-fdio-ha scenario combines components from three key open
+TODO: add LISP to components
+
+The apex-os-odl-fdio-dvr-ha scenario combines components from three key open
 source projects: OpenStack, OpenDaylight, and Fast Data (FD.io). The key
-components that realize the apex-os-odl_l2-fdio-ha scenario and which differ
+components that realize the apex-os-odl-fdio-dvr-ha scenario and which differ
 from a regular, OVS-based scenario, are the OpenStack ML2 OpenDaylight plugin,
 OpenDaylight Neutron Northbound, OpenDaylight Group Based Policy, OpenDaylight
 Virtual Bridge Domain Manager, FD.io Honeycomb management agent and FD.io
 Vector Packet Processor (VPP).
 
+Note that the key components of the OpenDaylight based scenarios of
+FastDataStacks are the same. The centrallized scenario "apex-os-odl-fdio-noha"
+and the DVR scenario "apex-os-odl-fdio-dvr-ha" share the same components.
+
 Here's a more detailed list of the individual software components involved:
 
 **Openstack Neutron ML2 OpenDaylight Plugin**: Handles Neutron data base
@@ -178,6 +190,9 @@ interfaces.
 
 The picture below shows the key components.
 
+TODO: update the image:
+    1. Add LISP
+
 .. image:: FDS-basic-components.jpg
 
 To provide a better understanding how the above mentioned components interact
@@ -209,31 +224,25 @@ Renderer and drives VPP configuration using VPP's local Java APIs.
 
 .. image:: FDS-simple-callflow.png
 
+TODO: add description (and possibly a picture) of how forwarding works -
+    describe how packets travel in the setup
+    NOTE: could be in some different place in the document
 
 Scenario Configuration
 ======================
 
-To enable the "apex-os-odl_l2-fdio-ha" scenario check the appropriate
+To enable the "apex-os-odl-fdio-dvr-ha" scenario check the appropriate
 settings in the APEX configuration files. Those are typically found in
 /etc/opnfv-apex.
 
-File "deploy_settings.yaml" choose opendaylight as controller with version
-"carbon" and enable vpp as forwarder. Also make sure that you set
-"ha_enabled" to "true" in the global_params section. "ha_enabled" is the
-only real difference from a configuration file perspective between the
-scenario with high availability when compared to the ODL-L2 scenario
-without high-availability support. "hugepages" need to set to a
-sufficiently large value for VPP to work. The default value for VPP is
-1024, but this only allows for a few VMs to be started. If feasible,
-choose a significantly larger number on the compute nodes::
-
-  global_params:
-    ha_enabled: true
+File "deploy_settings.yaml": Choose Opendaylight as controller with version
+"oxygen" and enable vpp as forwarder. "odl_routing_node" chooses the dvr
+setup for l3 forwarding::
 
   deploy_options:
     sdn_controller: opendaylight
-    sdn_l3: false
-    odl_version: carbon
+    odl_version: oxygen
+    odl_routing_node: dvr
     tacker: true
     congress: true
     sfc: false
@@ -264,28 +273,11 @@ choose a significantly larger number on the compute nodes::
           corelist-workers: 2
           uio-driver: uio_pci_generic
 
-
-Validated deployment environments
-=================================
-
-The "os-odl_l2-fdio-ha" scenario has been deployed and tested
-on the following sets of hardware:
- * Linux Foundation lab (Chassis: Cisco UCS-B-5108 blade server,
-   NICs: 8 external / 32 internal 10GE ports,
-   RAM: 32G (4 x 8GB DDR4-2133-MHz RDIMM/PC4-17000/single rank/x4/1.2v),
-   CPU: 3.50 GHz E5-2637 v3/135W 4C/15MB Cache/DDR4 2133MHz
-   Disk: 1.2 TB 6G SAS 10K rpm SFF  HDD) see also:
-   https://wiki.opnfv.org/display/pharos/Lflab+Hosting
- * OPNFV CENGN lab (https://wiki.opnfv.org/display/pharos/CENGN+Pharos+Lab)
- * Cisco internal development labs (UCS-B and UCS-C)
-
 Limitations, Issues and Workarounds
 ===================================
 
 For specific information on limitations and issues, please refer to the APEX
-installer release notes. Note that this high availability scenario
-deploys OpenStack in HA mode *and* OpenDaylight in cluster mode.
-
+installer release notes.
 
 References
 ==========
@@ -296,4 +288,3 @@ References
   * FD.io Vector Packet Processor (VPP): https://wiki.fd.io/view/VPP
   * OpenDaylight Controller: https://www.opendaylight.org/
   * OPNFV Danube release - more information: http://www.opnfv.org/danube
-
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-L3-DVR-example.png b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-L3-DVR-example.png
index 18932c3..18932c3 100755
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-L3-DVR-example.png
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-L3-DVR-example.png
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-L3-noha-sample-setup.png b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-L3-noha-sample-setup.png
index 27c8335..27c8335 100755
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-L3-noha-sample-setup.png
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-L3-noha-sample-setup.png
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/FDS-basic-components.jpg b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-basic-components.jpg
index e92851f..e92851f 100755
--- a/docs/scenarios/os-odl_l2-fdio-noha/FDS-basic-components.jpg
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-basic-components.jpg
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-odl_l3-noha-overview.png b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-odl_l3-noha-overview.png
index 1193ea4..1193ea4 100755
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-odl_l3-noha-overview.png
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-odl_l3-noha-overview.png
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/FDS-simple-callflow.png b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-simple-callflow.png
index 04546aa..04546aa 100755
--- a/docs/scenarios/os-odl_l2-fdio-noha/FDS-simple-callflow.png
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/FDS-simple-callflow.png
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/index.rst b/docs/scenarios/os-odl-fdio-dvr-noha/index.rst
index 3ccdda7..a365d31 100644
--- a/docs/scenarios/os-odl_l3-fdio-ha/index.rst
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/index.rst
@@ -1,15 +1,15 @@
-.. _os-odl_l3-fdio-ha:
+.. _os-odl-fdio-dvr-noha:
 
 .. OPNFV - Open Platform for Network Function Virtualization
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
 
-*********************************************************************
-Fast Data Stacks Scenario: os-odl_l3-fdio-ha Overview and Description
-*********************************************************************
+***********************************************************************
+Fast Data Stacks Scenario: os-odl-fdio-dvr-noha Overview and Description
+***********************************************************************
 
-Scenario: "OpenStack - Opendaylight (L3) - FD.io" (apex-os-odl_l3-fdio-ha)
+Scenario: "OpenStack - Opendaylight - FD.io DVR" (apex-os-odl-fdio-dvr-noha)
 is a scenario developed as part of the FastDataStacks
 OPNFV project.
 
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/scenario.description.rst b/docs/scenarios/os-odl-fdio-dvr-noha/scenario.description.rst
index b392070..4f09069 100755
--- a/docs/scenarios/os-odl_l2-fdio-noha/scenario.description.rst
+++ b/docs/scenarios/os-odl-fdio-dvr-noha/scenario.description.rst
@@ -2,18 +2,19 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-Scenario: "OpenStack - OpenDaylight (Layer 2) - FD.io"
+Scenario: "OpenStack - OpenDaylight - FD.io DVR"
 ======================================================
 
-Scenario: apex-os-odl_l2-fdio-noha
+Scenario: apex-os-odl-fdio-dvr-noha
 
-"apex-os-odl_l2-fdio-noha" is a scenario developed as part of the
+"apex-os-odl-fdio-dvr-noha" is a scenario developed as part of the
 FastDataStacks OPNFV project. The main components of the
-"apex-os-odl_l2-fdio-noha" scenario are:
+"apex-os-odl-fdio-dvr-noha" scenario are:
 
  - APEX (TripleO) installer (please also see APEX installer documentation)
  - Openstack (in non-HA configuration)
- - OpenDaylight controller (non-clustered) controlling layer 2 networking
+ - OpenDaylight controller (non-clustered)
+   controlling layer 2 and layer 3 networking
  - FD.io/VPP virtual forwarder for tenant networking
 
 Introduction
@@ -27,6 +28,7 @@ network topology.
 
 A solution stack is only as good as its foundation. Key foundational assets for
 NFV infrastructure are
+
   * The virtual forwarder: The virtual forwarder needs to be a feature rich,
     high performance, highly scale virtual switch-router. It needs to leverage
     hardware accelerators when available and run in user space.
@@ -41,6 +43,7 @@ NFV infrastructure are
 In order to meet the desired qualities of an NFV infrastructure, the
 following components were chosen for the "Openstack - OpenDaylight - FD.io"
 scenario:
+
   * FD.io Vector Packet Processor (VPP) - a highly scalable,
     high performance, extensible virtual forwarder
   * OpenDaylight Controller - an extensible controller platform which
@@ -50,7 +53,7 @@ scenario:
     component, and can be clustered to achieve a highly available
     deployment.
 
-The "Openstack - OpenDaylight - FD.io" scenario provides the capability to
+The "Openstack - OpenDaylight - FD.io DVR" scenario provides the capability to
 realize a set of use-cases relevant to the deployment of NFV nodes instantiated
 by means of an Openstack orchestration system on FD.io/VPP enabled compute
 nodes. The role of the Opendaylight network controller in this integration is
@@ -58,64 +61,84 @@ twofold. It provides a network device configuration and topology abstraction
 via the Openstack Neutron interface, while providing the capability to realize
 more complex network policies by means of Group Based Policies. Furthermore it
 also provides the capabilities to monitor as well as visualize the operation of
-the virtual network devices and their topologies.
-In supporting the general use-case of instantiatiting an NFV instance, two
-specific types of network transport use cases are realized:
+the virtual network devices and their topologies.  In supporting the general
+use-case of instantiatiting an NFV instance, two specific types of network
+transport use cases are realized:
 
   * NFV instances with VPP data-plane forwarding using a VLAN provider network
   * NFV instances with VPP data-plane forwarding using a VXLAN overlay
     transport network
 
-A deployment of the "apex-os-odl_l2-fdio-noha" scenario consists of 4 or more
+A deployment of the "apex-os-odl-fdio-dvr-noha" scenario consists of 4 or more
 servers:
 
   * 1 Jumphost hosting the APEX installer - running the Undercloud
-  * 1 Controlhost, which runs the Overcloud as well as OpenDaylight
-    as a network controller
-  * 2 or more Computehosts
-
-.. image:: FDS-odl_l2-overview.png
-
-Tenant networking leverages FD.io/VPP. Open VSwitch (OVS) is used for all
-other connectivity, in particular the connectivity to public networking / the
-Internet (i.e. br-ext) is performed via OVS as in any standard OpenStack
-deployment. The OpenDaylight network controller is used to setup and manage
-layer 2 networking for the scenario. Tenant networking can either leverage
-VXLAN (in which case a full mesh of VXLAN tunnels is created) or VLANs. Layer 3
-connectivity for a tenant network is provided centrally via qrouter on the
-control node. As in a standard OpenStack deployment, the Layer3 agent
-configures the qrouter and associated rulesets for security (security groups)
-and NAT (floating IPs). Public IP network connectivity for a tenant network is
-provided by interconnecting the VPP-based bridge domain representing the tenant
-network to qrouter using a tap interface. The setup is depicted below:
-
-.. image:: FDS-L3-tenant-connectivity.png
+  * 1 Controlhost, which runs the Overcloud as well as
+      OpenDaylight as a network controller
+  * 2 or more Computehosts. These Computehosts also serve as
+      layer 3 gateways for tenant networks.
+
+TODO: update the image:
+    1. Compute 0..N are gateways
+    2. NIC2 on controller is not in vpp
+
+.. image:: FDS-odl_l3-noha-overview.png
+
+Tenant and public networking leverages FD.io/VPP. On compute nodes,
+VPP binds to both the tenant networking interface as well as the public
+networking interface. This means that VPP is used for communication within
+a tenant network, between tenant networks, as well as between a tenant network
+and the Internet.
+
+Note that this setup slightly differs from the usual
+centralized L3 setup with qrouter on the control node. This setup was chosen
+to limit the configuration changes for the introduction of FD.io/VPP.  The
+OpenDaylight network controller is used to setup and manage layer 2 and
+layer 3 networking for the scenario - with Group Based Policy (GBP) being the
+key component. Tenant networking can either leverage VXLAN (in which case a
+full mesh of VXLAN tunnels is created) or VLANs.
+
+The picture below shows an example setup with two compute and one control
+node. Note that the external network is connected via compute node 0 through
+VPP. VPP provides all layer 3 services which are provided in a "vanilla"
+OpenStack deployment, including SNAT and DNAT, as well as north-south
+and east-west traffic filtering for security purposes ("security groups").
+
+TODO: update the image:
+    1. Add External network interface to Computenode-1
+
+.. image:: FDS-L3-noha-sample-setup.png
 
 Features of the scenario
 ------------------------
 
-Main features of the "apex-os-odl_l2-fdio-noha" scenario:
+Main features of the "apex-os-odl-fdio-dvr-noha" scenario:
 
   * Automated installation using the APEX installer
   * Fast and scalable tenant networking using FD.io/VPP as forwarder
-  * Layer 2 networking using VLANs or VXLAN, managed and
-    controlled through OpenDaylight
-  * Layer 3 connectivitiy for tenant networks supplied centrally on
-    the Control node through standard OpenStack mechanisms.
-    All layer 3 features apply, including floating IPs (i.e. NAT)
-    and security groups.
+  * Layer 2 networking using VLANs or VXLAN, managed
+    and controlled through OpenDaylight
+  * Layer 3 connectivitiy for tenant networks supplied
+    through FD.io/VPP. Layer 3 features, including security groups as well as
+    floating IP addresses (i.e. NAT) are implemented by the FD.io/VPP forwarder
   * Manual and automatic (via DHCP) addressing on tenant networks
 
 Scenario components and composition
 ===================================
 
-The apex-os-odl_l2-fdio-noha scenario combines components from three key open
+TODO: add LISP to components
+
+The apex-os-odl-fdio-dvr-noha scenario combines components from three key open
 source projects: OpenStack, OpenDaylight, and Fast Data (FD.io). The key
-components that realize the apex-os-odl_l2-fdio-noha scenario and which differ
+components that realize the apex-os-odl-fdio-dvr-noha scenario and which differ
 from a regular, OVS-based scenario, are the OpenStack ML2 OpenDaylight plugin,
-OpenDaylight Neutron Northbound, OpenDaylight (ODL) Group Based Policy (GBP),
-OpenDaylight Virtual Bridge Domain Manager (VBD), FD.io Honeycomb management
-agent and FD.io Vector Packet Processor (VPP).
+OpenDaylight Neutron Northbound, OpenDaylight Group Based Policy, OpenDaylight
+Virtual Bridge Domain Manager, FD.io Honeycomb management agent and FD.io
+Vector Packet Processor (VPP).
+
+Note that the key components of the OpenDaylight based scenarios of
+FastDataStacks are the same. The centrallized scenario "apex-os-odl-fdio-noha"
+and the DVR scenario "apex-os-odl-fdio-dvr-noha" share the same components.
 
 Here's a more detailed list of the individual software components involved:
 
@@ -167,6 +190,9 @@ interfaces.
 
 The picture below shows the key components.
 
+TODO: update the image:
+    1. Add LISP
+
 .. image:: FDS-basic-components.jpg
 
 To provide a better understanding how the above mentioned components interact
@@ -198,27 +224,25 @@ Renderer and drives VPP configuration using VPP's local Java APIs.
 
 .. image:: FDS-simple-callflow.png
 
+TODO: add description (and possibly a picture) of how forwarding works -
+    describe how packets travel in the setup
+    NOTE: could be in some different place in the document
 
 Scenario Configuration
 ======================
 
-To enable the "apex-os-odl_l2-fdio-noha" scenario check the appropriate
+To enable the "apex-os-odl-fdio-dvr-noha" scenario check the appropriate
 settings in the APEX configuration files. Those are typically found in
 /etc/opnfv-apex.
 
-File "deploy_settings.yaml" choose opendaylight as controller with version
-"carbon" and enable vpp as forwarder. "hugepages" need to set to a
-sufficiently large value for VPP to work. The default value for VPP is 1024,
-but this only allows for a few VMs to be started. If feasible, choose a
-significantly larger number on the compute nodes::
-
-  global_params:
-    ha_enabled: false
+File "deploy_settings.yaml": Choose Opendaylight as controller with version
+"oxygen" and enable vpp as forwarder. "odl_routing_node" chooses the dvr
+setup for l3 forwarding::
 
   deploy_options:
     sdn_controller: opendaylight
-    sdn_l3: false
-    odl_version: carbon
+    odl_version: oxygen
+    odl_routing_node: dvr
     tacker: true
     congress: true
     sfc: false
@@ -249,25 +273,11 @@ significantly larger number on the compute nodes::
           corelist-workers: 2
           uio-driver: uio_pci_generic
 
-
-Validated deployment environments
-=================================
-
-The "os-odl_l2-fdio-noha" scenario has been deployed and tested
-on the following sets of hardware:
- * Linux Foundation lab (Chassis: Cisco UCS-B-5108 blade server,
-   NICs: 8 external / 32 internal 10GE ports,
-   RAM: 32G (4 x 8GB DDR4-2133-MHz RDIMM/PC4-17000/single rank/x4/1.2v),
-   CPU: 3.50 GHz E5-2637 v3/135W 4C/15MB Cache/DDR4 2133MHz
-   Disk: 1.2 TB 6G SAS 10K rpm SFF  HDD) see also:
-   https://wiki.opnfv.org/display/pharos/Lflab+Hosting
- * OPNFV CENGN lab (https://wiki.opnfv.org/display/pharos/CENGN+Pharos+Lab)
- * Cisco internal development labs (UCS-B and UCS-C)
-
 Limitations, Issues and Workarounds
 ===================================
 
-For specific information on limitations and issues, please refer to the APEX installer release notes.
+For specific information on limitations and issues, please refer to the APEX
+installer release notes.
 
 References
 ==========
@@ -277,5 +287,4 @@ References
   * Fast Data (FD.io): https://fd.io/
   * FD.io Vector Packet Processor (VPP): https://wiki.fd.io/view/VPP
   * OpenDaylight Controller: https://www.opendaylight.org/
-  * OPNFV Carbon release - more information: http://www.opnfv.org/carbon
-
+  * OPNFV Danube release - more information: http://www.opnfv.org/danube
diff --git a/docs/scenarios/os-odl-fdio-ha/FDS-L3-noha-sample-setup.png b/docs/scenarios/os-odl-fdio-ha/FDS-L3-noha-sample-setup.png
new file mode 100755
index 0000000..27c8335
--- /dev/null
+++ b/docs/scenarios/os-odl-fdio-ha/FDS-L3-noha-sample-setup.png
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-basic-components.jpg b/docs/scenarios/os-odl-fdio-ha/FDS-basic-components.jpg
index e92851f..e92851f 100755
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-basic-components.jpg
+++ b/docs/scenarios/os-odl-fdio-ha/FDS-basic-components.jpg
diff --git a/docs/scenarios/os-odl-fdio-ha/FDS-odl_l3-noha-overview.png b/docs/scenarios/os-odl-fdio-ha/FDS-odl_l3-noha-overview.png
new file mode 100755
index 0000000..1193ea4
--- /dev/null
+++ b/docs/scenarios/os-odl-fdio-ha/FDS-odl_l3-noha-overview.png
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-simple-callflow.png b/docs/scenarios/os-odl-fdio-ha/FDS-simple-callflow.png
index 04546aa..04546aa 100755
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-simple-callflow.png
+++ b/docs/scenarios/os-odl-fdio-ha/FDS-simple-callflow.png
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/index.rst b/docs/scenarios/os-odl-fdio-ha/index.rst
index b014451..f02c451 100644
--- a/docs/scenarios/os-odl_l2-fdio-ha/index.rst
+++ b/docs/scenarios/os-odl-fdio-ha/index.rst
@@ -1,4 +1,4 @@
-.. _os-odl_l2-fdio-ha:
+.. _os-odl-fdio-ha:
 
 .. OPNFV - Open Platform for Network Function Virtualization
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
@@ -6,10 +6,10 @@
 
 
 *********************************************************************
-Fast Data Stacks Scenario: os-odl_l2-fdio-ha Overview and Description
+Fast Data Stacks Scenario: os-odl-fdio-ha Overview and Description
 *********************************************************************
 
-Scenario: "OpenStack - Opendaylight (L2) - FD.io" (apex-os-odl_l2-fdio-ha)
+Scenario: "OpenStack - Opendaylight - FD.io" (apex-os-odl-fdio-ha)
 is a scenario developed as part of the FastDataStacks
 OPNFV project.
 
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/scenario.description.rst b/docs/scenarios/os-odl-fdio-ha/scenario.description.rst
index 4a69a32..9377879 100755
--- a/docs/scenarios/os-odl_l3-fdio-ha/scenario.description.rst
+++ b/docs/scenarios/os-odl-fdio-ha/scenario.description.rst
@@ -2,14 +2,14 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-Scenario: "OpenStack - OpenDaylight (Layer 3) - FD.io"
+Scenario: "OpenStack - OpenDaylight - FD.io"
 ======================================================
 
-Scenario: apex-os-odl_l3-fdio-ha
+Scenario: apex-os-odl-fdio-ha
 
-"apex-os-odl_l3-fdio-ha" is a scenario developed as part of the
+"apex-os-odl-fdio-ha" is a scenario developed as part of the
 FastDataStacks OPNFV project. The main components of the
-"apex-os-odl_l3-fdio-ha" scenario are:
+"apex-os-odl-fdio-ha" scenario are:
 
  - APEX (TripleO) installer (please also see APEX installer documentation)
  - Openstack (in HA configuration)
@@ -28,6 +28,7 @@ network topology.
 
 A solution stack is only as good as its foundation. Key foundational assets for
 NFV infrastructure are
+
   * The virtual forwarder: The virtual forwarder needs to be a feature rich,
     high performance, highly scale virtual switch-router. It needs to leverage
     hardware accelerators when available and run in user space.
@@ -42,6 +43,7 @@ NFV infrastructure are
 In order to meet the desired qualities of an NFV infrastructure, the
 following components were chosen for the "Openstack - OpenDaylight - FD.io"
 scenario:
+
   * FD.io Vector Packet Processor (VPP) - a highly scalable,
     high performance, extensible virtual forwarder
   * OpenDaylight Controller - an extensible controller platform which
@@ -68,7 +70,7 @@ transport use cases are realized:
   * NFV instances with VPP data-plane forwarding using a VXLAN overlay
     transport network
 
-A deployment of the "apex-os-odl_l3-fdio-ha" scenario consists of 6 or more
+A deployment of the "apex-os-odl-fdio-ha" scenario consists of 6 or more
 servers:
 
   * 1 Jumphost hosting the APEX installer - running the Undercloud
@@ -104,7 +106,7 @@ and east-west traffic filtering for security purposes ("security groups").
 Features of the scenario
 ------------------------
 
-Main features of the "apex-os-odl_l3-fdio-ha" scenario:
+Main features of the "apex-os-odl-fdio-ha" scenario:
 
   * Automated installation using the APEX installer
   * Fast and scalable tenant networking using FD.io/VPP as forwarder
@@ -119,18 +121,14 @@ Main features of the "apex-os-odl_l3-fdio-ha" scenario:
 Scenario components and composition
 ===================================
 
-The apex-os-odl_l3-fdio-ha scenario combines components from three key open
+The apex-os-odl-fdio-ha scenario combines components from three key open
 source projects: OpenStack, OpenDaylight, and Fast Data (FD.io). The key
-components that realize the apex-os-odl_l3-fdio-ha scenario and which differ
+components that realize the apex-os-odl-fdio-ha scenario and which differ
 from a regular, OVS-based scenario, are the OpenStack ML2 OpenDaylight plugin,
 OpenDaylight Neutron Northbound, OpenDaylight Group Based Policy, OpenDaylight
 Virtual Bridge Domain Manager, FD.io Honeycomb management agent and FD.io
 Vector Packet Processor (VPP).
 
-Note that the key components of the OpenDaylight based scenarios of
-FastDataStacks are the same. The Layer 2 scenario "apex-os-odl_l2-fdio-ha"
-and the Layer 3 scenario "apex-os-odl_l3-fdio-ha" share the same components.
-
 Here's a more detailed list of the individual software components involved:
 
 **Openstack Neutron ML2 OpenDaylight Plugin**: Handles Neutron data base
@@ -215,7 +213,7 @@ Renderer and drives VPP configuration using VPP's local Java APIs.
 Scenario Configuration
 ======================
 
-To enable the "apex-os-odl_l3-fdio-ha" scenario check the appropriate
+To enable the "apex-os-odl-fdio-ha" scenario check the appropriate
 settings in the APEX configuration files. Those are typically found in
 /etc/opnfv-apex.
 
diff --git a/docs/scenarios/os-odl-fdio-noha/FDS-L3-noha-sample-setup.png b/docs/scenarios/os-odl-fdio-noha/FDS-L3-noha-sample-setup.png
new file mode 100755
index 0000000..27c8335
--- /dev/null
+++ b/docs/scenarios/os-odl-fdio-noha/FDS-L3-noha-sample-setup.png
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-basic-components.jpg b/docs/scenarios/os-odl-fdio-noha/FDS-basic-components.jpg
index e92851f..e92851f 100755
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-basic-components.jpg
+++ b/docs/scenarios/os-odl-fdio-noha/FDS-basic-components.jpg
diff --git a/docs/scenarios/os-odl-fdio-noha/FDS-odl_l3-noha-overview.png b/docs/scenarios/os-odl-fdio-noha/FDS-odl_l3-noha-overview.png
new file mode 100755
index 0000000..1193ea4
--- /dev/null
+++ b/docs/scenarios/os-odl-fdio-noha/FDS-odl_l3-noha-overview.png
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-simple-callflow.png b/docs/scenarios/os-odl-fdio-noha/FDS-simple-callflow.png
index 04546aa..04546aa 100755
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-simple-callflow.png
+++ b/docs/scenarios/os-odl-fdio-noha/FDS-simple-callflow.png
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/index.rst b/docs/scenarios/os-odl-fdio-noha/index.rst
index e053d57..283080e 100644
--- a/docs/scenarios/os-odl_l3-fdio-noha/index.rst
+++ b/docs/scenarios/os-odl-fdio-noha/index.rst
@@ -1,4 +1,4 @@
-.. _os-odl_l3-fdio-noha:
+.. _os-odl-fdio-noha:
 
 .. OPNFV - Open Platform for Network Function Virtualization
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
@@ -6,10 +6,10 @@
 
 
 ***********************************************************************
-Fast Data Stacks Scenario: os-odl_l3-fdio-noha Overview and Description
+Fast Data Stacks Scenario: os-odl-fdio-noha Overview and Description
 ***********************************************************************
 
-Scenario: "OpenStack - Opendaylight (L3) - FD.io" (apex-os-odl_l3-fdio-noha)
+Scenario: "OpenStack - Opendaylight - FD.io" (apex-os-odl-fdio-noha)
 is a scenario developed as part of the FastDataStacks
 OPNFV project.
 
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/scenario.description.rst b/docs/scenarios/os-odl-fdio-noha/scenario.description.rst
index 6bbf12b..c9927ff 100755
--- a/docs/scenarios/os-odl_l3-fdio-noha/scenario.description.rst
+++ b/docs/scenarios/os-odl-fdio-noha/scenario.description.rst
@@ -2,14 +2,14 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-Scenario: "OpenStack - OpenDaylight (Layer 3) - FD.io"
+Scenario: "OpenStack - OpenDaylight - FD.io"
 ======================================================
 
-Scenario: apex-os-odl_l3-fdio-noha
+Scenario: apex-os-odl-fdio-noha
 
-"apex-os-odl_l3-fdio-noha" is a scenario developed as part of the
+"apex-os-odl-fdio-noha" is a scenario developed as part of the
 FastDataStacks OPNFV project. The main components of the
-"apex-os-odl_l3-fdio-noha" scenario are:
+"apex-os-odl-fdio-noha" scenario are:
 
  - APEX (TripleO) installer (please also see APEX installer documentation)
  - Openstack (in non-HA configuration)
@@ -28,6 +28,7 @@ network topology.
 
 A solution stack is only as good as its foundation. Key foundational assets for
 NFV infrastructure are
+
   * The virtual forwarder: The virtual forwarder needs to be a feature rich,
     high performance, highly scale virtual switch-router. It needs to leverage
     hardware accelerators when available and run in user space.
@@ -42,6 +43,7 @@ NFV infrastructure are
 In order to meet the desired qualities of an NFV infrastructure, the
 following components were chosen for the "Openstack - OpenDaylight - FD.io"
 scenario:
+
   * FD.io Vector Packet Processor (VPP) - a highly scalable,
     high performance, extensible virtual forwarder
   * OpenDaylight Controller - an extensible controller platform which
@@ -68,7 +70,7 @@ transport use cases are realized:
   * NFV instances with VPP data-plane forwarding using a VXLAN overlay
     transport network
 
-A deployment of the "apex-os-odl_l3-fdio-noha" scenario consists of 4 or more
+A deployment of the "apex-os-odl-fdio-noha" scenario consists of 4 or more
 servers:
 
   * 1 Jumphost hosting the APEX installer - running the Undercloud
@@ -102,7 +104,7 @@ and east-west traffic filtering for security purposes ("security groups").
 Features of the scenario
 ------------------------
 
-Main features of the "apex-os-odl_l3-fdio-noha" scenario:
+Main features of the "apex-os-odl-fdio-noha" scenario:
 
   * Automated installation using the APEX installer
   * Fast and scalable tenant networking using FD.io/VPP as forwarder
@@ -116,18 +118,14 @@ Main features of the "apex-os-odl_l3-fdio-noha" scenario:
 Scenario components and composition
 ===================================
 
-The apex-os-odl_l3-fdio-noha scenario combines components from three key open
+The apex-os-odl-fdio-noha scenario combines components from three key open
 source projects: OpenStack, OpenDaylight, and Fast Data (FD.io). The key
-components that realize the apex-os-odl_l3-fdio-noha scenario and which differ
+components that realize the apex-os-odl-fdio-noha scenario and which differ
 from a regular, OVS-based scenario, are the OpenStack ML2 OpenDaylight plugin,
 OpenDaylight Neutron Northbound, OpenDaylight Group Based Policy, OpenDaylight
 Virtual Bridge Domain Manager, FD.io Honeycomb management agent and FD.io
 Vector Packet Processor (VPP).
 
-Note that the key components of the OpenDaylight based scenarios of
-FastDataStacks are the same. The Layer 2 scenario "apex-os-odl_l2-fdio-noha"
-and the Layer 3 scenario "apex-os-odl_l3-fdio-noha" share the same components.
-
 Here's a more detailed list of the individual software components involved:
 
 **Openstack Neutron ML2 OpenDaylight Plugin**: Handles Neutron data base
@@ -212,7 +210,7 @@ Renderer and drives VPP configuration using VPP's local Java APIs.
 Scenario Configuration
 ======================
 
-To enable the "apex-os-odl_l3-fdio-noha" scenario check the appropriate
+To enable the "apex-os-odl-fdio-noha" scenario check the appropriate
 settings in the APEX configuration files. Those are typically found in
 /etc/opnfv-apex.
 
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/FDS-L3-tenant-connectivity.png b/docs/scenarios/os-odl_l2-fdio-ha/FDS-L3-tenant-connectivity.png
deleted file mode 100755
index 9de77e5..0000000
--- a/docs/scenarios/os-odl_l2-fdio-ha/FDS-L3-tenant-connectivity.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/FDS-basic-callflow.jpg b/docs/scenarios/os-odl_l2-fdio-ha/FDS-basic-callflow.jpg
deleted file mode 100755
index 96464f8..0000000
--- a/docs/scenarios/os-odl_l2-fdio-ha/FDS-basic-callflow.jpg
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/FDS-odl_l2-ha-overview.png b/docs/scenarios/os-odl_l2-fdio-ha/FDS-odl_l2-ha-overview.png
deleted file mode 100755
index 78526da..0000000
--- a/docs/scenarios/os-odl_l2-fdio-ha/FDS-odl_l2-ha-overview.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/FDS-odl_l2-overview.png b/docs/scenarios/os-odl_l2-fdio-ha/FDS-odl_l2-overview.png
deleted file mode 100755
index 2755099..0000000
--- a/docs/scenarios/os-odl_l2-fdio-ha/FDS-odl_l2-overview.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-ha/os-odl_l2-fdio-ha-colorado2_1.png b/docs/scenarios/os-odl_l2-fdio-ha/os-odl_l2-fdio-ha-colorado2_1.png
deleted file mode 100755
index aa23495..0000000
--- a/docs/scenarios/os-odl_l2-fdio-ha/os-odl_l2-fdio-ha-colorado2_1.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/FDS-L3-tenant-connectivity.png b/docs/scenarios/os-odl_l2-fdio-noha/FDS-L3-tenant-connectivity.png
deleted file mode 100755
index 9de77e5..0000000
--- a/docs/scenarios/os-odl_l2-fdio-noha/FDS-L3-tenant-connectivity.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/FDS-basic-callflow.jpg b/docs/scenarios/os-odl_l2-fdio-noha/FDS-basic-callflow.jpg
deleted file mode 100755
index 96464f8..0000000
--- a/docs/scenarios/os-odl_l2-fdio-noha/FDS-basic-callflow.jpg
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l2-fdio-noha/FDS-odl_l2-overview.png b/docs/scenarios/os-odl_l2-fdio-noha/FDS-odl_l2-overview.png
deleted file mode 100755
index 2755099..0000000
--- a/docs/scenarios/os-odl_l2-fdio-noha/FDS-odl_l2-overview.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-basic-callflow.jpg b/docs/scenarios/os-odl_l3-fdio-ha/FDS-basic-callflow.jpg
deleted file mode 100755
index 96464f8..0000000
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-basic-callflow.jpg
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l3-fdio-ha/FDS-odl_l3-overview.png b/docs/scenarios/os-odl_l3-fdio-ha/FDS-odl_l3-overview.png
deleted file mode 100755
index 5b90c93..0000000
--- a/docs/scenarios/os-odl_l3-fdio-ha/FDS-odl_l3-overview.png
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-basic-callflow.jpg b/docs/scenarios/os-odl_l3-fdio-noha/FDS-basic-callflow.jpg
deleted file mode 100755
index 96464f8..0000000
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-basic-callflow.jpg
+++ /dev/null
diff --git a/docs/scenarios/os-odl_l3-fdio-noha/FDS-odl_l3-overview.png b/docs/scenarios/os-odl_l3-fdio-noha/FDS-odl_l3-overview.png
deleted file mode 100755
index 5b90c93..0000000
--- a/docs/scenarios/os-odl_l3-fdio-noha/FDS-odl_l3-overview.png
+++ /dev/null