From 4f5655136c79442f0c5d0c430b03e26c4bcda300 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Tue, 8 Oct 2019 08:18:36 +0200 Subject: AF and TH: minor update - Remove test directory from ch 4 - Remove 4.2.1 Extending functionality - Fix path to deactivate, the correct way to run is: ~/automation_and_systemtest$ deactivate Change-Id: I614c7769ba6044bd8fd2d67e72d0658102f71b23 Signed-off-by: Sona Sarmadi --- .../doc/automation_framework_test_harness.xml | 139 +-------------------- .../doc/getting_started.xml | 8 +- 2 files changed, 5 insertions(+), 142 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 ffdda0d..da661db 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 @@ -2,121 +2,6 @@ Automation Framework and Test Harness - The Automation Framework and Test Harness installation directory is - structured as follows: - - . -|-- automation_framework -| |-- device -| | |-- addDevice.py -| | |-- getEventsForUcpe.py -| | |-- removeDevice.py -| | `-- waitDeviceUp.py -| |-- eneaUcpeMgr.py -| |-- network -| | |-- bindNetworkInterface.py -| | |-- delNetworkBridge.py -| | |-- getNetworkInterfaces.py -| | |-- newNetworkBridge.py -| | `-- unbindNetworkInterface.py -| |-- unittestSuite -| | |-- config -| | | |-- addDevice.json -| | | |-- bindNetworkInterface.json -| | | |-- controlVNFI.json -| | | |-- delNetworkBridge.json -| | | |-- destroyVNFI.json -| | | |-- instantiateVNFI.json -| | | |-- newNetworkBridge.json -| | | |-- offboardVNF.json -| | | |-- onboardVNF.json -| | | |-- onboardVNFRaw.json -| | | |-- removeDevice.json -| | | |-- unbindNetworkInterface.json -| | | `-- waitDeviceUp.json -| | |-- fortigateCleanup.json -| | |-- fortigateDeploy.json -| | |-- unittestLoader.py -| | `-- unittestSuite.py -| `-- vnf -| |-- controlVNFI.py -| |-- destroyVNFI.py -| |-- instantiateVNFI.py -| |-- offboardVNF.py -| |-- onboardVNF.py -| `-- onboardVNFRaw.py -|-- ansible.cfg -|-- hosts -|-- setup_env.sh -|-- lab_config -| |-- intelc3850-2 -| | |-- intelc3850-2.json -| | |-- lan_br.json -| | |-- lan_nic.json -| | |-- wan_br.json -| | `-- wan_nic.json -| |-- inteld1521-1 -| | |-- inteld1521-1.json -| | |-- lan_br.json -| | |-- lan_nic.json -| | |-- mgmt_nic.json -| | |-- sfc_br.json -| | |-- vnf_mgmt_br.json -| | |-- wan_br.json -| | `-- wan_nic.json -| `-- inteld1521-2 -| |-- inteld1521-2.json -| |-- lan_br.json -| |-- lan_nic.json -| |-- mgmt_nic.json -| |-- sfc_br.json -| |-- vnf_mgmt_br.json -| |-- wan_br.json -| `-- wan_nic.json -|-- playbooks -| |-- addBridge.yml -| |-- addDevice.yml -| |-- bindNIC.yml -| |-- chainedVNFsService -| | |-- chainedVNFsService.yml -| | |-- cleanupChainedVNFsService.yml -| | `-- testChainedVNFsService.yml -| |-- controlVNFI.yml -| |-- deleteBridge.yml -| |-- destroyVNFI.yml -| |-- fortigateFWService -| | |-- cleanupFortigateFWInstance.yml -| | |-- cleanupTestFortigateFWInstance.yml -| | |-- instantiateFortigateFW.yml -| | `-- testFortigateFWInstance.yml -| |-- instantiateVNFI.yml -| |-- offboardVNF.yml -| |-- onboardVNFBundle.yml -| |-- onboardVNFImage.yml -| |-- removeDevice.yml -| |-- setupuCPEManager.yml -| |-- unbindNIC.yml -| `-- unittestSuiteTest -| |-- cleanupFortigateFWScenario.yml -| `-- deployFortigateFWScenario.yml -|-- uCPEM_config -| `-- ucpem01.json -|-- vnf_config -| |-- fortigateFWImage -| | |-- fortigateFWImage.json -| | |-- fortigateFWInstance1.json -| | `-- fortigateFWInstance2.json -| |-- fortigateImage -| | |-- fortigateFWInstance.json -| | `-- fortigateImage.json -| `-- junipervSRXImage -| |-- junipervSRXImage.json -| |-- junipervSRXInstanceAtomC1.json -| |-- junipervSRXInstanceAtomC2.json -| |-- junipervSRXInstanceXeonD1.json -| `-- junipervSRXInstanceXeonD2.json -`-- vnf_image -
Automation Framework @@ -1907,27 +1792,5 @@ fortigateFWInstance Ansible and the Python logs are stored in the ansible.log and debug.log files, respectively. - -
- Extending functionality - Test Suites - - Extending the functionality of the Test Harness, typically - requires the functionality of the Automation Framework to also be - extended to cover additional uCPE Manager REST Northbound APIs. The - extension of the Automation Framework will result in new Python modules - that have to be created. - - Additional Python modules, that are not related to the - functionality of the Automation Framework, could be easily integrated - into the Test Harness to aid in the creation of more complex test cases. - Using the TH, test cases can be implemented that run directly on the - boards with Enea NFV Access, over SSH. - - For a better understanding of the Test Harness functionality and - how to extend the test suites, please refer to the chapter "Sample Test - Cases" from the Enea NFV Access System Test Specification document - olink to the chapter needed here.and the TH code - source. -
- \ 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 e4aaa6b..2f430c3 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 @@ -159,7 +159,7 @@ - Unzip the nfvaccess22_af-th.zip archive + Unzip the nfvaccess<version>_af-th.zip archive file, provided by Enea, on a supported host machine. The directory in which the archive has been unpacked will be @@ -210,8 +210,8 @@ After the initial setup, each session ends by closing the Python - virtual environment: source - <AF-THinstall-dir>/testHarness/bin/deactivate. + virtual environment through running deactivate + from the <AF-THinstall-dir> directory. Subsequent use of the installation requires activating the Python virtual enviroment before using the Automation Framework and Test Harness: @@ -223,4 +223,4 @@ setupuCPEManager.yml playbook with the corresponding JSON config for the new uCPE Manager instance. - \ No newline at end of file + -- cgit v1.2.3-54-g00ecf