From 93433ff108e9395b779b131ebf4e1cf6bba2dae1 Mon Sep 17 00:00:00 2001 From: mrpa Date: Wed, 25 Mar 2020 14:29:38 +0100 Subject: Updated several usecases to match updated info. Change-Id: I29eb0e295e80cd2d8ec6a548a528cdceb5929263 Signed-off-by: mrpa --- .../doc/clav_vnf_examples.xml | 4 +- .../doc/forti_vnf_examples.xml | 142 +++++++++------------ .../doc/images/uc_fortigate_sdwan.png | Bin 43402 -> 43532 bytes .../doc/images/uc_fortigate_sdwan.svg | 72 +++++------ .../doc/vnf_chaining.xml | 29 +++-- 5 files changed, 112 insertions(+), 135 deletions(-) diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml index 1da91fe..57c79b5 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml @@ -367,8 +367,8 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10 Select uCPE device 1, access Configuration, add the network interface that will be used and configure it for - SR-IOV. For sriov-mode select "adapter-pool" and - "sriov-num-vfs:2". + SR-IOV. For sriov-mode select adapter-pool and for + sriov-num-vfs select "2". diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml index 547cda4..a56fc0a 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml @@ -41,7 +41,7 @@ - The following files are needed for this example use-case: + The following file(s) are needed for this example use-case: @@ -49,12 +49,8 @@ its license file. - VNF Configuration files, provided with your Enea NFV Access - release: - - fortigate-basic-fw.conf. - fortigate-sdwan<x>.conf. - + VNF Configuration file(s), provided with your Enea NFV Access + release: fortigate-basic-fw.conf. @@ -76,11 +72,27 @@ Network Configuration: Since the firewall uses three External Network Interfaces, three - bridges need to be configured. Each bridge provides the ability to - connect a physical network interface to the virtual machines' virtual - network interface. + bridges need to be configured. Each bridge provides the ability to connect a physical network interface to the virtual network interface of a VM. + + Setup of the uCPE device: + + Connect WAN to the Lab Network. + + + + Connect LAN1 to the Test Machine. + + + + Leave LAN2 unconnected. + + + + Connect ETH0 to the Lab Network (for Enea uCPE Manager communications). + + Select the uCPE device, access Configuration and bind the three physical network @@ -90,8 +102,6 @@ Create three OVS bridges, one for each DPDK network interface (WAN, LAN1 and LAN2). - - Alternatively, the firewall can be setup to use bridges as connection points for the FortiGate VNF, by replacing the OVS-DPDK @@ -110,27 +120,8 @@ each LAN interface, only one will be used for both LAN1 and LAN2, with no changes in WAN interface configuration. - - Setup of the uCPE device: - - - - WAN connected to the Lab Network. - - - - LAN1 connected to the Test Machine. - - - - LAN2 unconnected. - - - ETH0 connected to the Lab Network (for Enea uCPE Manager - communications). - - + Onboarding the VNF: @@ -157,7 +148,7 @@ Interfaces: Add 3 - interfaces. + interfaces (wan, lan1 and lan2). @@ -212,21 +203,21 @@ Port1 - WAN: Set the External Interface type to DPDK and connect it to the - wanmgrbr ovs bridge. + wan_br ovs bridge. Port2 - LAN1: Set the Incoming Interface type to DPDK and connect it to the - lan1 ovs bridge. + lan1_br ovs bridge. Port3 - LAN2: Set the Outgoing Interface type to DPDK and connect it to the - lan2 ovs bridge. + lan2_br ovs bridge. The names of the ports used during instantiation need to be @@ -307,13 +298,8 @@ its license file. - VNF Configuration files, provided with your Enea NFV Access - release: - - fortigate-basic-fw.conf. - fortigate-sdwan<x>.conf. - - + VNF Configuration file(s), provided with your Enea NFV Access + release: fortigate-sdwan<x>.conf. @@ -347,45 +333,39 @@ Each VNF instance will have a virtual interface for VNF management, for the WAN network and for LAN communication. + Setup of an Intel Whitebox uCPE device: + - - Select uCPE Device 1, access Configuration - and bind the three physical network interfaces to the DPDK. + + Connect the VNFMgr interfaces to the Lab Network for VNF management access. - Create three OVS bridges, one for each DPDK network interface - (VNF management, WAN and LAN). + Directly connect the WAN interfaces back to back (using a cable) or connected via VPN. - Repeat the steps above for uCPE device 2. + Connect the LAN interfaces to the Test Machine. - - - Setup of an Intel Whitebox uCPE - device: - - VNFMgr. Connected to the Lab Network for - VNF management access. + Connect the ETH0 interfaces to the Lab Network (for Enea uCPE Manager communications). - WAN interfaces. Directly connected through - the Ethernet cable. + Select uCPE Device 1, access Configuration + and bind the three physical network interfaces to the DPDK. - LAN. Connected to the Test Machine. + Create three OVS bridges, one for each DPDK network interface + (VNF management, WAN and LAN). - ETH0. Connected to the Lab Network (for - Enea uCPE Manager communications). + Repeat the steps above for uCPE device 2. - + Onboarding the VNF: @@ -417,17 +397,17 @@ vnfmgr: to connect it to - the vnfmgrbr bridge. + the vnfmgmt_br bridge. wan: to connect it to the - wanbr bridge. + wan_br bridge. lan: to connect it to the - lanbr bridge. + lan_br bridge. @@ -454,11 +434,9 @@ will fail. - Instantiating the FortiGate - VNF: + Instantiating the FortiGate VNF: - Instantiate the FortiGate VNF by filling the required fields with - the following values: + Instantiate the FortiGate VNF by filling the required fields with the following values: @@ -484,42 +462,42 @@ Configuration file: The SD-WAN example configuration files provided by Enea: - fortigate-sdwan1.conf and - fortigate-sdwan2.conf. + fortigate-sdwan1.conf for the FortiGate VNF on uCPE device 1 and + fortigate-sdwan2.conf for the FortiGate VNF on uCPE device 2. Port1 - VNF Mgr: Set the type to DPDK and connect it to the - vnfmgrbr bridge. + vnfmgmt_br bridge. Port2 - WAN: Set the type to DPDK and connect it to the - wanbr bridge. + wan_br bridge. Port3 - LAN: Set the type to DPDK and connect it to the - lanbr bridge. + lan_br bridge. Instantiate the FortiGate VNF on uCPE device 1 using the sdwan1 example configuration file. + To complete the branch-to-branch setup, configure uCPE + device 2 in the same way as uCPE device 1. + Make sure to use the sdwan2 configuration file for + the second VNF instantiation. + The names of the ports used during instantiation need to be the same as the ones described above, as the same names will be used in the configuration files provided for this example use-case. - - To complete the branch-to-branch setup, configure uCPE - device 2 in the same way as uCPE device 1. - Make sure to use the sdwan2 configuration file for - the second VNF instantiation.
@@ -540,9 +518,7 @@ Machine-2. - uCPE device 1 should be able to ping Test - uCPE device 2 in this setup over the WAN connection. - The FortiGate VNF management interface can be accessed from a web + The Test Machine connected to uCPE device 1 should be able to ping the Test Machine connected to uCPE device 2 in this setup, over the WAN connection. The FortiGate VNF management interface can be accessed from a web browser on the Lab Machine. For more details please see FortiGate VNF Web Management, Deploy the FortiGate Firewall in its default - settings. + settings.Maybe more info about how to do it should be added here. diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png index acc3e53..cd82461 100755 Binary files a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png and b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png differ diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg index ff65f57..4255bf6 100755 --- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg +++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg @@ -15,9 +15,9 @@ width="830.0929" height="482.41965" viewBox="0 0 830.09292 482.41966" - sodipodi:docname="uc_fortigate_sdwan_new.svg" + sodipodi:docname="uc_fortigate_sdwan.svg" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_sdwan_new.png" + inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_sdwan.png" inkscape:export-xdpi="65.519997" inkscape:export-ydpi="65.519997"> - - - lan_br - + id="g1360"> + + wan_br dpdk diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml index 83dd51e..b003629 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml @@ -52,11 +52,10 @@ Juniper vSRX VNF image file. - VNF Configuration files, provided with your Enea NFV Access - Release: + VNF Configuration files, provided with your Enea NFV Access Release: vSRX-domain-update-script. - vSRX-Site<x>.conf. + vSRX-Site<x>.iso. FortiFW-Site<x>.conf. @@ -75,7 +74,7 @@ fileref="images/uc_vnf_chaining.png" /> - + No info about vnf_mgmt_br? Network Configuration: @@ -143,10 +142,10 @@ - The Flavor selected must have at least 2 CPUs and 3 GB RAM - since vSRX is quite resource consuming. + The Flavor selected must have at least 2 vCPUs and 4 GB RAM since vSRX is + quite resource consuming. - Tested in-house with 4 vCPUs/ 3 GB RAM. + Tested in-house with 4 vCPUs/ 6 GB RAM. @@ -155,9 +154,12 @@ - Select ISO on the Cloud-Init - tab. + Select ISO as the Cloud-Init Datasource in the Cloud-Init + tab. + + Select cdrom as the Cloud-Init Disk Type in the Cloud-Init + tab. @@ -176,10 +178,13 @@ - Select ConfigDrive on the Cloud-Init - tab. + Select ConfigDrive as the Cloud-Init Datasource in the + Cloud-Init tab. + Select cdrom as the Cloud-Init Disk + Type in the Cloud-Init tab. + Add license as the Cloud-Init content in the Cloud-Init tab files. @@ -285,7 +290,7 @@ At this point the service will be up and running on Site1. Repeat - the necessary steps for Site2, by changing the configuration files + the steps to instantiate a VNF for Site2, by changing the configuration files accordingly. After the service is deployed on both branches, the VPN tunnel is -- cgit v1.2.3-54-g00ecf