From bd68331f814af264653a73064731c1ee57d94ba3 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Tue, 28 May 2019 08:14:31 +0200 Subject: af_th: replace target with uCPE device - Replace WhiteBox with uCPE device, no where else in the documentation we use whitebox - Remove references to solution - Replace "Enea NFV Access" with "Enea NFV Access Runtime Platform" - Some minor corrections Change-Id: Ie42ec1e6776b580d1791cf60d65540f61f1f7da3 Signed-off-by: Sona Sarmadi --- .../doc/automation_framework_test_harness.xml | 44 ++++++++++----------- .../doc/components.xml | 22 +++++------ .../doc/getting_started.xml | 29 +++++++------- .../doc/images/ChainedVNFsService_setup.png | Bin 117103 -> 105328 bytes .../doc/images/autofw_testh_overview.png | Bin 87813 -> 92459 bytes .../doc/images/environment_basicsetup.png | Bin 103831 -> 97013 bytes .../doc/overview.xml | 10 ++--- 7 files changed, 52 insertions(+), 53 deletions(-) (limited to 'doc') diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml index 85d8dbf..3a154fa 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml @@ -130,7 +130,7 @@ Manager. The /network folder contains Python scripts for - binding or unbinding a network interface to/from a target (DPDK or + binding or unbinding a network interface to/from a uCPE device (DPDK or SR-IOV), creating or deleting an OVS network bridge, or dumping network interface information about the available interfaces. @@ -384,21 +384,21 @@ test 002: Wait VCPE Agent device be up (__main__.UnittestSuite) ... 2019-03-07 18:03:29,356 - INFO: Done 2019-03-07 18:03:29,365 - DEBUG: Logging out and exiting... ok -test 003: Bind lan NIC to DPDK target (__main__.UnittestSuite) ... +test 003: Bind lan NIC to DPDK (__main__.UnittestSuite) ... 2019-03-07 18:03:29,366 - INFO: Bind NIC 2019-03-07 18:03:29,406 - DEBUG: Login successful on host 'localhost' 2019-03-07 18:03:29,406 - DEBUG: Session token is: 8c719cb0-40f2-11e9-a81f525400d08e1d 2019-03-07 18:03:29,415 - DEBUG: Found device with name 'intelc3850-2' -2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1' to dpdk target +2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1' 2019-03-07 18:03:30,030 - INFO: Done 2019-03-07 18:03:30,067 - DEBUG: Logging out and exiting... ok -test 004: Bind wan NIC to DPDK target (__main__.UnittestSuite) ... +test 004: Bind wan NIC to DPDK (__main__.UnittestSuite) ... 2019-03-07 18:03:30,068 - INFO: Bind NIC 2019-03-07 18:03:30,086 - DEBUG: Login successful on host 'localhost' 2019-03-07 18:03:30,087 - DEBUG: Session token is: 8cd95f32-40f2-11e9-a81f525400d08e1d 2019-03-07 18:03:30,095 - DEBUG: Found device with name 'intelc3850-2' -2019-03-07 18:03:30,096 - DEBUG: Bind NIC '0000:03:00.2' to dpdk target +2019-03-07 18:03:30,096 - DEBUG: Bind NIC '0000:03:00.2' 2019-03-07 18:03:30,729 - INFO: Done 2019-03-07 18:03:30,767 - DEBUG: Logging out and exiting... ok @@ -513,11 +513,11 @@ test 003: Deleting network bridge WAN (__main__.UnittestSuite) ... 2019-03-07 18:04:57,931 - INFO: Delete OVS network bridge 2019-03-07 18:04:59,464 - INFO: Done ok -test 004: Unbind lan NIC from DPDK target (__main__.UnittestSuite) ... +test 004: Unbind lan NIC from DPDK uCPE device (__main__.UnittestSuite) ... 2019-03-07 18:04:59,477 - INFO: Unbind NIC 2019-03-07 18:05:00,639 - INFO: Done ok -test 005: Unbind wan NIC from DPDK target (__main__.UnittestSuite) ... +test 005: Unbind wan NIC from DPDK uCPE device (__main__.UnittestSuite) ... 2019-03-07 18:05:00,658 - INFO: Unbind NIC 2019-03-07 18:05:01,533 - INFO: Done ok @@ -767,10 +767,10 @@ Options:
- Bind a uCPE Device + Bind a network interface - Binds a physical network interface to a DPDK or SR-IOV - target. + Binds a physical network interface to a DPDK or SR-IOV. +
Script Options @@ -778,7 +778,7 @@ Options: $ python bindNetworkInterface.py -h Usage: bindNetworkInterface.py [options] -Binds a physical network interface to a DPDK or SR-IOV target. +Binds a physical network interface to a DPDK or SR-IOV. Options: --version show program's version number and exit @@ -809,11 +809,11 @@ format Sample unit-test JSON file format:[ { - "name": "Bind lan NIC to DPDK target ", + "name": "Bind lan NIC to DPDK", "args": "-f ../../lab_config/intelc3850-2/lan_nic.json" }, { - "name": "Bind wan NIC to DPDK target ", + "name": "Bind wan NIC to DPDK ", "args": "-f ../../lab_config/intelc3850-2/wan_nic.json" } ]Sample lan_nic.json configuration @@ -842,17 +842,16 @@ format 2019-03-07 18:03:29,406 - DEBUG: Login successful on host 'localhost' 2019-03-07 18:03:29,406 - DEBUG: Session token is: 8c719cb0-40f2-11e9-a81f525400d08e1d 2019-03-07 18:03:29,415 - DEBUG: Found device with name 'intelc3850-2' -2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1' to dpdk target +2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1' 2019-03-07 18:03:30,030 - INFO: Done 2019-03-07 18:03:30,067 - DEBUG: Logging out and exiting...
- Unbind a uCPE Device + Unbind a network interface - Unbinds a physical network interface from a DPDK or SR-IOV - target. + Unbinds a physical network interface from DPDK or SR-IOV.
Script Options @@ -860,7 +859,7 @@ format $ python unbindNetworkInterface.py -h Usage: unbindNetworkInterface.py [options] -Unbinds a physical network interface from a DPDK or SR-IOV target. +Unbinds a physical interface to the DPDK or SR-IOV. Options: --version show program's version number and exit @@ -891,11 +890,12 @@ Options: Sample unit-test JSON file format:[ { - "name": "Unbind lan NIC from DPDK target", + "name": "Unbind lan NIC", "args": "-f ../../lab_config/intelc3850-2/lan_nic.json" }, { - "name": "Unbind wan NIC from DPDK target", + name": "Unbind wan NIe", +Unbinds a physical interface to the DPDK or SR-IOV "args": "-f ../../lab_config/intelc3850-2/wan_nic.json" } ] @@ -931,7 +931,7 @@ Options: 2019-03-07 17:33:54,431 - DEBUG: Login successful on host 'localhost' 2019-03-07 17:33:54,432 - DEBUG: Session token is: 6a77a1d1-40ee-11e9-a81f525400d08e1d 2019-03-07 17:33:54,467 - DEBUG: Found device with name 'intelc3850-2' -2019-03-07 17:33:54,468 - DEBUG: Unbind NIC '0000:01:00.1' from dpdk target +2019-03-07 17:33:54,468 - DEBUG: Unbind NIC '0000:01:00.1' 2019-03-07 17:33:55,616 - INFO: Done 2019-03-07 17:33:55,659 - DEBUG: Logging out and exiting...
@@ -1664,4 +1664,4 @@ fortigateFWInstance the TH code source.
- \ No newline at end of file + diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml index 8b98ca2..bbfccd7 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml @@ -2,7 +2,7 @@ Components - An overview of the Enea NFV Access solution and the uCPE Manager in + An overview of the Enea NFV Access Run Time Platform and the uCPE Manager in cooperation with the Automation Framework and Test Harness, will be presented in detail. @@ -17,11 +17,11 @@ -
- Enea NFV Access Solution +
+ Enea NFV Access - The Enea NFV Access Solution is comprised of the Enea NFV Access - Runtime Platform and the Enea uCPE Manager. + The Enea NFV Access is comprised of the Enea NFV Access + Run time Platform and the Enea uCPE Manager.
Enea uCPE Manager @@ -37,10 +37,10 @@
- Enea NFV Access + Enea NFV Access Run time Platform - One or more NFV Access devices are required as target hosts - running the VNF(s). The NFV Access device is known to the uCPE Manager + One or more uCPE devices running the NFV Access Run Time Platform are + required as hosts running the VNF(s). The uCPE device is known to the uCPE Manager as the "VcpeAgent" device module. Adding a VcpeAgent device can be done via one of two @@ -94,14 +94,14 @@ VNF, Device and Network Smoke Test Cases. A sample test suite - that acts as basic smoke tests for the Enea NFV Access Solution and + that acts as basic smoke tests for the Enea NFV Access and also as a sanity-check test suite for the AF and TH. VNF Deployment and Lifecycle. A sample test suite that verifies the instantiation, lifecycle control and destruction of a VNF for the - Enea NFV Access Solution. + Enea NFV Access. @@ -115,4 +115,4 @@ chapter "Sample Test Cases" from the Enea NFV Access System Test Specification document.
- \ No newline at end of file + diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml index b7ff8f4..b3386b8 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml @@ -83,8 +83,8 @@ - 1st Intel Whitebox - target device + 1st uCPE + device Minimum 4 Physical Network Devices. @@ -98,13 +98,12 @@ - Enea NFV Access installed. + Enea NFV Access Run Time Platform installed. - For information on how to install Enea NFV Accessthe - solution or the platform?, refer to "Getting Started with - Enea NFV Access" from the Enea NFV Access Getting Started - manual. + For information on how to install Enea NFV Access + refer to "Getting Started with Enea NFV Access" from the + Enea NFV Access Getting Started manual.
@@ -119,8 +118,8 @@
- Changes to 1st Intel Whitebox target - device + Changes to 1st + uCPE device @@ -128,13 +127,13 @@ - 1 Physical connection back to back with the 2nd Intel Whitebox - target device. + 1 Physical connection back to back with the + 2nd uCPE device. - 2nd Intel Whitebox - target device + 2nd uCPE + device Minimum 4 Physical Network Devices. @@ -149,7 +148,7 @@ 1 Physical connection back to back with the - 1st Intel Whitebox target device. + 1st uCPE device. @@ -220,4 +219,4 @@ setupuCPEManager.yml playbook with the corresponding JSON config for the new uCPE Manager instance.
- \ No newline at end of file + diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png index fad8009..a345989 100755 Binary files a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png differ diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png index 7599ead..a597a91 100755 Binary files a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png differ diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png index 0b92f7a..6bd35d4 100755 Binary files a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png differ diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml index 9b9eaaa..045ceef 100644 --- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml +++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml @@ -3,7 +3,7 @@ Overview This document describes the Automation Framework and Test Harness for - the Enea NFV Access Solution, a long with providing instructions regarding + the Enea NFV Access, a long with providing instructions regarding the necessary steps to run these software tools.
@@ -16,8 +16,8 @@ The Test Harness is based on running Ansible Playbooks to complete different test cases, which make use of the Automation Framework Python - modules and/or direct commands on the boards running Enea NFV - Access. + modules and/or direct commands on the uCPE devices running Enea NFV + Access Run Time Platform.
@@ -39,7 +39,7 @@ - Enea NFV Access Solution + Enea NFV Access Enea NFV Access (with ODM) Runtime Platform and Enea uCPE Manager. @@ -193,4 +193,4 @@
- \ No newline at end of file + -- cgit v1.2.3-54-g00ecf