From 821db501147d91236856695a2f5570e060a13420 Mon Sep 17 00:00:00 2001 From: mrpa Date: Thu, 2 Apr 2020 14:31:07 +0200 Subject: Fixing overlapping footer issues in eg. usescase manual. Change-Id: Iee8b37dfd725c060695f0511e84c267dbd82336d Signed-off-by: mrpa --- .../doc/128t_vnf_router.xml | 32 +++-- .../doc/forti_vnf_examples.xml | 139 ++++++++++++--------- .../doc/service_chaining_128t_fortigate.xml | 40 +++--- .../doc/vnf_chaining.xml | 89 +++++++------ 4 files changed, 167 insertions(+), 133 deletions(-) diff --git a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml index ceae04f..9b63248 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml @@ -48,7 +48,7 @@ Use-case Setup Configuring Network Interfaces on uCPE - devices: + devices: Log into the uCPE Manager with both username and password values: admin. @@ -130,9 +130,10 @@ Device ID - Also configured during installation of the device (E.g.: Target-15). + Also configured during installation of the device + (E.g.: Target-15). - + OK @@ -151,14 +152,12 @@ Configure the virtualization infrastructure for 128T VNF by - creating three OVS bridges and a host interface. + creating three OVS bridges and a host interface: Add the Host Interface by selecting the trgt device, then - Configuration -> External Interfaces -> Configuration - -> Add. - - Fill in the required fields with the following - data: + Configuration -> External Interfaces -> + Configuration -> Add, and fill in the required fields + with the following data: Host Interface Details @@ -207,11 +206,10 @@
- + Select the trgt device then: Configuration -> - OpenVSwitch -> Bridges -> Add. - - Fill in the required fields for each bridge with the following data from each + OpenVSwitch -> Bridges -> Add, and fill in the + required fields for each bridge with the following data from each table: @@ -313,7 +311,7 @@
- + lan_br Bridge Details @@ -687,8 +685,8 @@ - Select the trgt uCPE device -> Configuration -> - External Interfaces -> Configuration. Select all interfaces -> + Select the trgt uCPE device -> Configuration -> External + Interfaces -> Configuration. Select all interfaces -> Delete. @@ -699,4 +697,4 @@ - + \ No newline at end of file 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 a56fc0a..b5e7803 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 @@ -27,7 +27,7 @@ System requirements for the uCPE device: - + 4 x Network Interfaces @@ -43,16 +43,17 @@ The following file(s) are needed for this example use-case: - + - FortiGate VNF image. Please contact Fortinet to get a VNF image and - its license file. + FortiGate VNF image. Please contact Fortinet to get a VNF + image and its license file. - VNF Configuration file(s), provided with your Enea NFV Access - release: fortigate-basic-fw.conf. + + VNF Configuration file(s), provided with your Enea NFV Access + release: fortigate-basic-fw.conf. - +
@@ -72,9 +73,11 @@ 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 network interface of a VM. + 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: + Setup of the uCPE device: @@ -90,7 +93,8 @@ - Connect ETH0 to the Lab Network (for Enea uCPE Manager communications). + Connect ETH0 to the Lab Network (for Enea uCPE Manager + communications). @@ -103,23 +107,22 @@ 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 - bridges with SR-IOV connection points. - - Please note that while previously three physical interfaces were - presumed necessary for VNF connection, in the case of a firewall setup - only two physical interfaces are required for the data path (one for WAN - and one for LAN). + Alternatively, the firewall can be setup to use bridges as + connection points for the FortiGate VNF, by replacing the OVS-DPDK + bridges with SR-IOV connection points. - Only two interfaces will be configured as DPDK, with two bridges - created, one for each type of connection. + Please note that while previously three physical interfaces + were presumed necessary for VNF connection, in the case of a + firewall setup only two physical interfaces are required for the + data path (one for WAN and one for LAN). Only two interfaces will be + configured as DPDK, with two bridges created, one for each type of + connection. - - At VNF instantiation instead of assigning distinct bridges for - each LAN interface, only one will be used for both LAN1 and LAN2, with - no changes in WAN interface configuration. - + + At VNF instantiation instead of assigning distinct bridges + for each LAN interface, only one will be used for both LAN1 and + LAN2, with no changes in WAN interface configuration. + @@ -147,8 +150,8 @@ - Interfaces: Add 3 - interfaces (wan, lan1 and lan2). + Interfaces: Add 3 interfaces + (wan, lan1 and lan2). @@ -221,9 +224,9 @@ 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. - + the same as the ones described above, as the same names will be + used in the configuration files provided for this example + use-case. @@ -276,7 +279,7 @@ Two uCPE devices will be needed for this setup. The system requirements for each uCPE device are: - + 4 x Network Interfaces @@ -292,15 +295,17 @@ The following files are needed for this example use-case: - + - FortiGate VNF image. Please contact Fortinet to get a VNF image and - its license file. + FortiGate VNF image. Please contact Fortinet to get a VNF + image and its license file. - VNF Configuration file(s), provided with your Enea NFV Access - release: fortigate-sdwan<x>.conf. - + + VNF Configuration file(s), provided with your Enea NFV Access + release: fortigate-sdwan<x>.conf. + +
@@ -316,12 +321,12 @@ - - - When connecting, the uCPE devices can use a back-to-back or a VPN connection. - An appropriate interface with the required capabilities needs to be chosen for - this purpose. - + + + When connecting, the uCPE devices can use a back-to-back or a + VPN connection. An appropriate interface with the required + capabilities needs to be chosen for this purpose. + Network Configuration: @@ -333,23 +338,28 @@ 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: + Setup of an Intel Whitebox uCPE + device: - - Connect the VNFMgr interfaces to the Lab Network for VNF management access. + + Connect the VNFMgr interfaces to the Lab + Network for VNF management access. - Directly connect the WAN interfaces back to back (using a cable) or connected via VPN. + Directly connect the WAN interfaces back to + back (using a cable) or connected via VPN. - Connect the LAN interfaces to the Test Machine. + Connect the LAN interfaces to the Test + Machine. - Connect the ETH0 interfaces to the Lab Network (for Enea uCPE Manager communications). + Connect the ETH0 interfaces to the Lab + Network (for Enea uCPE Manager communications). @@ -434,9 +444,11 @@ 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: @@ -462,8 +474,9 @@ Configuration file: The SD-WAN example configuration files provided by Enea: - fortigate-sdwan1.conf for the FortiGate VNF on uCPE device 1 and - fortigate-sdwan2.conf for the FortiGate VNF on uCPE device 2. + fortigate-sdwan1.conf for the FortiGate VNF on + uCPE device 1 and fortigate-sdwan2.conf for the + FortiGate VNF on uCPE device 2. @@ -494,10 +507,10 @@ 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. - + 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. +
@@ -518,8 +531,11 @@ Machine-2. - 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 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.Maybe more info about how to do it should be added here. + settings. + + Maybe more info about how to do it should be added + here. diff --git a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml index 2c256a1..4719399 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml @@ -55,8 +55,7 @@ - + @@ -73,9 +72,8 @@ Add the trgt uCPE device into the uCPE Manager: - Devices -> Manage -> Add. - - Fill in the required fields with the following data: + Devices -> Manage -> Add, and fill in the + required fields with the following data:
Device Details @@ -143,13 +141,14 @@ null - + Device ID - Also configured during installation of the device (E.g.: Target-15). + Also configured during installation of the device + (E.g.: Target-15). - + OK @@ -173,9 +172,8 @@ Add the Host Interface by selecting the trgt device, then Configuration -> External Interfaces -> - Configuration -> Add. - - Fill in the required fields with the following data: + Configuration -> Add, and fill in the required fields + with the following data:
Host Interface Details @@ -262,13 +260,13 @@ ibm_br - + ovs-bridge-type inbandMgmt - + Create @@ -1004,9 +1002,9 @@ admin, and leaving the password blank. - Make sure the WAN interface of the trgt device has access to - the internet. The Fortigate VNF requires internet access to validate - the license. + Make sure the WAN interface of the trgt device has access to the + internet. The Fortigate VNF requires internet access to validate the + license. In order to validate the data path connect a test machine to the @@ -1026,8 +1024,8 @@ - Select the trgt uCPE device -> VNF -> Instances. - Select the 128T and Fortigate VNFs -> Delete. + Select the trgt uCPE device -> VNF -> Instances. Select + the 128T and Fortigate VNFs -> Delete. @@ -1036,8 +1034,8 @@ - Select the trgt uCPE device -> Configuration -> - External Interfaces -> Configuration. Select all interfaces -> + Select the trgt uCPE device -> Configuration -> External + Interfaces -> Configuration. Select all interfaces -> Delete. @@ -1048,4 +1046,4 @@ - + \ No newline at end of file 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 b003629..b8b0d5e 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 @@ -29,19 +29,21 @@ 4 GB of RAM memory - + - On each uCPE device, 3 interfaces need to be DPDK compliant and one - of these needs to be connected back-to-back to the other uCPE - device. This link simulates a WAN/uplink connection. Optionally, - one additional device (PC/laptop) can be connected on the LAN port - of each branch to run LAN-to-LAN connectivity tests. + On each uCPE device, 3 interfaces need to be DPDK compliant and + one of these needs to be connected back-to-back to the other uCPE + device. This link simulates a WAN/uplink connection. Optionally, one + additional device (PC/laptop) can be connected on the LAN port of each + branch to run LAN-to-LAN connectivity tests. The following files are needed for this example use-case: - - To procure the VNF image files and their licenses, please contact each respective VNF - provider. + + + To procure the VNF image files and their licenses, please + contact each respective VNF provider. + @@ -51,15 +53,26 @@ 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>.iso. - FortiFW-Site<x>.conf. - + + vSRX-domain-update-script. + + + + vSRX-Site<x>.iso. + + + + FortiFW-Site<x>.conf. + + - +
@@ -74,7 +87,9 @@ fileref="images/uc_vnf_chaining.png" /> - No info about vnf_mgmt_br? + + + No info about vnf_mgmt_br? Network Configuration: @@ -127,8 +142,8 @@ The networking setup (Steps 1-3) can be modeled using the Offline Configuration entry, so that it is automatically - provisioned on the uCPE device, once it gets enrolled into the management - system (uCPE Manager). + provisioned on the uCPE device, once it gets enrolled into the + management system (uCPE Manager). @@ -142,8 +157,8 @@ - The Flavor selected must have at least 2 vCPUs and 4 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/ 6 GB RAM. @@ -154,19 +169,21 @@ - Select ISO as the Cloud-Init Datasource in 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. + Select cdrom as the Cloud-Init Disk + Type in the Cloud-Init tab. + Onboard Fortigate FW using the VNF Onboarding Wizard: - + The Flavor selected can be quite light in resource consumption, e.g. 1 CPU and 1 GB RAM. @@ -178,12 +195,14 @@ - Select ConfigDrive as the Cloud-Init Datasource in 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. + + Select cdrom as the Cloud-Init Disk + Type in the Cloud-Init tab. + Add license as the Cloud-Init content @@ -250,8 +269,8 @@ - Use FortiFW-Site1.conf as the Cloud-Init - file. + Use FortiFW-Site1.conf as the + Cloud-Init file. @@ -262,7 +281,7 @@ Add virtual interfaces: - + Management interface added to vnf_mgmt_br. @@ -290,8 +309,8 @@ At this point the service will be up and running on Site1. Repeat - the steps to instantiate a VNF for Site2, by changing the configuration files - accordingly. + 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 established and LAN to LAN visibility can be verified by connecting one -- cgit v1.2.3-54-g00ecf