From a16951b041e5e26e7712b39664c60b67208762dc Mon Sep 17 00:00:00 2001 From: mrpa Date: Tue, 17 Aug 2021 01:05:54 +0200 Subject: Updated the ATFH UG, Test Spec and Example UC books with name change references. Change-Id: Ic20ae8aef490ed7a86d39f4603e1656e07fed17f Signed-off-by: mrpa --- .../doc/automation_framework_test_harness.xml | 50 +++++---- .../doc/128t_vnf_router.xml | 4 +- .../doc/service_chaining_128t_fortigate.xml | 4 +- .../doc/sample_test_cases.xml | 121 ++++++++++++--------- 4 files changed, 100 insertions(+), 79 deletions(-) diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml index 33acaee..8113c3a 100644 --- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml +++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml @@ -5,6 +5,12 @@
Automation Framework + + The NFVA and uCPE Manager terms from this document and from the + source code are references to the Enea Edge Runtime and the Enea Edge + Management application components, respectively. + + All Automation Framework sources are under the <AF-TH-install-dir>/automation_framework directory. @@ -1862,7 +1868,7 @@ Options: format:[ { "name": "Upload NFVA image on uCPE Manager", - "args": "-f /tmp/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d" + "args": "-f /tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d" } ]
@@ -1874,7 +1880,7 @@ Options: executed individually by running the following command line: $ python uploadImage.py -u admin -p admin -H localhost \ --f /tmp/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d +-f /tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d 2020-02-28 11:38:42,754 - DEBUG: Started logging 2020-02-28 11:38:42,755 - INFO: Upload NFVA image on uCPE Manager 2020-02-28 11:38:43,307 - DEBUG: Login successful on host 'localhost' @@ -1882,7 +1888,7 @@ Options: 2020-02-28 11:41:29,148 - INFO: Verify image validation flag 2020-02-28 11:41:29,149 - INFO: Valid flag: True 2020-02-28 11:41:29,344 - INFO: The image \ -'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' was successfully uploaded +'enea-edge-runtime-xeon_d.ostree.tar.bz2' was successfully uploaded 2020-02-28 11:41:29,344 - INFO: Done 2020-02-28 11:41:29,388 - DEBUG: Logging out and exiting... @@ -1933,7 +1939,7 @@ Options: format:[ { "name": "Delete NFVA image on uCPE Manager", - "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2" + "args": "-i enea-edge-runtime-xeon_d.ostree.tar.bz2" } ] @@ -1945,17 +1951,17 @@ Options: executed individually by running the following command line: $ python deleteUpgradeFile.py -u admin -p admin -H localhost -i \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 +enea-edge-runtime-xeon_d.ostree.tar.bz2 2020-02-28 12:06:20,111 - DEBUG: Started logging 2020-02-28 12:06:20,112 - INFO: Delete NFVA image from uCPE Manager 2020-02-28 12:06:20,210 - DEBUG: Login successful on host 'localhost' 2020-02-28 12:06:20,211 - DEBUG: Session token is: 594b2d50-5a1a-11ea-a3de-5652b3ac1c30 2020-02-28 12:06:20,255 - INFO: The image \ -'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' was successfully found +'enea-edge-runtime-xeon_d.ostree.tar.bz2' was successfully found 2020-02-28 12:06:20,256 - INFO: The oid for \ -'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' image name is as follows: \ -VcpeAgent/xeon_d/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -2020-02-28 12:06:20,449 - INFO: The 'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' \ +'enea-edge-runtime-xeon_d.ostree.tar.bz2' image name is as follows: \ +VcpeAgent/xeon_d/enea-edge-runtime-xeon_d.ostree.tar.bz2 +2020-02-28 12:06:20,449 - INFO: The 'enea-edge-runtime-xeon_d.ostree.tar.bz2' \ image was successfully removed 2020-02-28 12:06:20,479 - INFO: Done 2020-02-28 12:06:20,517 - DEBUG: Logging out and exiting... @@ -2016,7 +2022,7 @@ Options: [ { "name": "Install and activate NFVA image on uCPE device from uCPE Manager", - "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16" + "args": "-i enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d -d inteld1521-16" } ] @@ -2028,7 +2034,7 @@ Options: executed individually by running the following command line: $ python installAndActivate.py -u admin -p admin -H localhost -i \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16 +enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d -d inteld1521-16 2020-02-28 12:36:46,137 - DEBUG: Started logging 2020-02-28 12:36:46,138 - INFO: Install and activate NFVA image from uCPE Manager 2020-02-28 12:36:46,288 - DEBUG: Login successful on host 'localhost' @@ -2037,29 +2043,29 @@ enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16 2020-02-28 12:36:46,459 - INFO: Display info about NFVA installation \ [inteld1521-16:1001:172.24.12.152] Install Started 2020-02-28 12:36:46,492 - INFO: Transferring Image: \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 +enea-edge-runtime-xeon_d.ostree.tar.bz2 2020-02-28 12:36:56,552 - INFO: Verifying Release [1] 2020-02-28 12:37:06,599 - INFO: Verifying Release [2] 2020-02-28 12:37:16,652 - INFO: Validating Upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 +enea-edge-runtime-xeon_d.ostree.tar.bz2 2020-02-28 12:37:26,713 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [3] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [3] 2020-02-28 12:37:36,770 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [5] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [5] 2020-02-28 12:37:46,819 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [7] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [7] 2020-02-28 12:37:56,879 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [9] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [9] 2020-02-28 12:38:06,920 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [11] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [11] 2020-02-28 12:38:16,975 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [13] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [13] 2020-02-28 12:38:27,019 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [15] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [15] 2020-02-28 12:38:37,091 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [18] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [18] 2020-02-28 12:38:47,133 - INFO: Validating upgrade to \ -enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [20] +enea-edge-runtime-xeon_d.ostree.tar.bz2 [20] 2020-02-28 12:38:57,186 - INFO: Waiting for release to become active 2020-02-28 12:39:07,231 - INFO: Upgrade Request Complete 2020-02-28 12:39:17,242 - INFO: Installation completed! diff --git a/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml index 993da22..f722aef 100644 --- a/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml +++ b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml @@ -692,7 +692,7 @@ Select the trgt uCPE device -> VNF -> Instances -> - 128T -> Delete. + 128T_trgt_1 -> Delete. @@ -707,7 +707,7 @@ - VNF -> Descriptors, select all bundles -> + VNF -> Descriptors, select 128T -> Offboard. diff --git a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml index 1412d68..3208168 100644 --- a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml +++ b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml @@ -1055,8 +1055,8 @@ - VNF -> Descriptors. Select all bundles -> - Offboard. + VNF -> Select one by one, the Fortigate and 128T VNF + Descriptors -> Offboard. diff --git a/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml index 9fa6bda..c32a784 100644 --- a/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml +++ b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml @@ -1,10 +1,16 @@ - + Sample Test Cases The test cases specified in this chapter are implemented as a Sample Test Suite included in the TH. + + The NFVA and uCPE Manager terms from this document and from the + source code are references to the Enea Edge Runtime and the Enea Edge + Management application components, respectively. + +
VNF, Device and Network Smoke Test Cases @@ -61,7 +67,8 @@ vnfd=<VNF-Descriptor-name>" VNF - Offboard a VNF Description: Removing a VNF - Descriptor from the Enea Edge Management. For details please refer to: + Descriptor from the Enea Edge Management. For details please refer + to: @@ -125,8 +132,8 @@ vnfd=<VNF-Descriptor-name>"
Device - Upload a Edge image - Description: Upload a Edge - image file onto the Enea Edge Management. For details please refer to: + Description: Upload a Edge image + file onto the Enea Edge Management. For details please refer to: @@ -150,7 +157,7 @@ vnfd=<VNF-Descriptor-name>" image_path="<Image-path>" -e upgrade_type="<Upgrade-type>" Example: ansible-playbook playbooks/uploadImage.yml -e \ -image_path="/tmp/enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \ +image_path="/tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2" -e \ upgrade_type="xeon_d" Result: Output of the test case @@ -194,7 +201,7 @@ A file with the same name is already uploaded. image_name="<Image-name>" Example: ansible-playbook playbooks/deleteUpgradeFile.yml -e \ -image_name="enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2" +image_name="enea-edge-runtime-xeon_d.ostree.tar.bz2" Result: Output of the test case run using the Test Harness:TASK [Remove NFVA image -- Run deleteUpgradeFile.py module from automation_framework] @@ -255,8 +262,8 @@ localhost : ok=1 changed=1 unreachable=0 failed=0Preconditions: - The device must be previously added to the Enea Edge Management - instance. + The device must be previously added to the Enea Edge + Management instance. @@ -274,7 +281,7 @@ image_name="<Image_name>" -e upgrade_type="<Upgrade_type>" -e \ device="<Device-name>" Example: ansible-playbook playbooks/installAndActivate.yml -e \ -image_name="enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \ +image_name="enea-edge-runtime-xeon_d.ostree.tar.bz2" -e \ upgrade_type=xeon_d -e device=inteld1521-16" Result: Output of the test case @@ -291,12 +298,12 @@ Duplicate entry - Release already installed
- Device - Upload, Install and Activate a Edge image on a - uCPE device + Device - Upload, Install and Activate a Edge image on a uCPE + device Description: Upload, install and - activate a Edge image on a uCPE device from the Enea Edge Management. For - details please refer to: + activate a Edge image on a uCPE device from the Enea Edge Management. + For details please refer to: @@ -335,8 +342,8 @@ Duplicate entry - Release already installed - The device has to be previously added to the Enea Edge Management - instance. + The device has to be previously added to the Enea Edge + Management instance. @@ -357,8 +364,8 @@ image_name="<Image-name>" -e upgrade_type="<Upgrade-type>"Example: ansible-playbook playbooks/installNFVAImage.yml -e \ device="inteld1521-16" -e \ -image_path=/tmp/enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \ -image_name=enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \ +image_path=/tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2 -e \ +image_name=enea-edge-runtime-xeon_d.ostree.tar.bz2 -e \ upgrade_type=xeon_d Result: Output of the test case @@ -388,8 +395,8 @@ upgrade_type=xeon_d - The device has to be previously added to the Enea Edge Management - instance. + The device has to be previously added to the Enea Edge + Management instance. @@ -413,7 +420,8 @@ upgrade_type=xeon_d Device - Remove a Device Description: Removing a uCPE - device from the Enea Edge Management. For details please refer to: + device from the Enea Edge Management. For details please refer + to: @@ -429,8 +437,8 @@ upgrade_type=xeon_d - The device has to be previously added to the Enea Edge Management - instance. + The device has to be previously added to the Enea Edge + Management instance. @@ -517,7 +525,8 @@ upgrade_type=xeon_d - A NIC is bound to a device in a Enea Edge Management instance. + A NIC is bound to a device in a Enea Edge Management + instance. @@ -638,8 +647,8 @@ bridge=<Bridge-name>" Precondition: - A device must have been previously added and connected to the Enea Edge - Management instance. + A device must have been previously added and connected to the Enea + Edge Management instance. Action: Run the configDPDK.yml Ansible Playbook with the @@ -693,12 +702,12 @@ DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!"
- Custom Scripts - Upload a Custom Script from the Enea Edge Management to - a Device + Custom Scripts - Upload a Custom Script from the Enea Edge + Management to a Device Description: Upload a Custom - Script from the Enea Edge Management to a Device. For details please refer - to: + Script from the Enea Edge Management to a Device. For details please + refer to: @@ -719,8 +728,8 @@ DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!" - A Custom Script must have been previously added to the Enea Edge - Management instance. + A Custom Script must have been previously added to the Enea + Edge Management instance. @@ -745,7 +754,8 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!" Management Description: Remove a Custom - Script from the Enea Edge Management. For details please refer to: + Script from the Enea Edge Management. For details please refer + to: @@ -827,7 +837,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"< Store Description: Adding an Offline - Config Store to the Enea Edge Management. For details please refer to: + Config Store to the Enea Edge Management. For details please refer + to: @@ -872,7 +883,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"< Store Description: Removing an Offline - Config Store from the Enea Edge Management. For details please refer to: + Config Store from the Enea Edge Management. For details please refer + to: @@ -887,7 +899,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"< Precondition: The Offline Configuration Store the user wishes to remove should - exist in the Enea Edge Management. If it does not, the test will say so. + exist in the Enea Edge Management. If it does not, the test will say + so. Action: Run the removeConfigStore.yml Ansible Playbook with the @@ -908,8 +921,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"< Configuration Store Description: Adding a network - bridge to an Offline Config Store in Enea Edge Management. For details please - refer to: + bridge to an Offline Config Store in Enea Edge Management. For details + please refer to: @@ -1027,7 +1040,8 @@ INFO: Done - The device should be connected to the Enea Edge Management. + The device should be connected to the Enea Edge + Management. @@ -1078,7 +1092,8 @@ INFO: Done - The device should be connected to the Enea Edge Management. + The device should be connected to the Enea Edge + Management. @@ -1109,7 +1124,8 @@ INFO: Done VNF Deployment and Lifecycle The following details the automated suite that handles the testing - of the instantiation, lifecycle and destruction of a VNF for Enea Edge. + of the instantiation, lifecycle and destruction of a VNF for Enea + Edge.
Instantiating a VNFI @@ -1130,8 +1146,8 @@ INFO: Done Preconditions: A VNF Image is onboarded and a device is added and connected - to the Enea Edge Management. Depending on the VNF, other steps may be - required. + to the Enea Edge Management. Depending on the VNF, other steps may + be required. @@ -1507,8 +1523,7 @@ FortigateFWInstance tested successfully! - Python Unit-Test Suite in - The custom script should have been previously saved in - <AF-TH-install-dir>/lab_config/customScripts. + The custom script should have been previously saved in + <AF-TH-install-dir>/lab_config/customScripts. - + - Add device settings in the hosts Ansible inventory file under - [customScriptDevice] and remove the inteld1521-1 - example. + Add device settings in the hosts Ansible + inventory file under [customScriptDevice] and + remove the inteld1521-1 example. - + Example: - + [customScriptDevice] inteld1521-1 ansible_host=172.24.12.73 ansible_port=22 ansible_user=root \ ansible_pass=root - + Action: Run basicTest.yml (example data for test_success_after_always): -- cgit v1.2.3-54-g00ecf