From 1a3028ba9b8baf1ccd2b13b2dde62e82b5a348ee Mon Sep 17 00:00:00 2001 From: mrpa Date: Tue, 13 Oct 2020 12:41:57 +0200 Subject: Updated the AFTH, Eg UC and the Test Spec. Change-Id: I4ec4dc8a3889ed581684db2bae73b782053ba90d Signed-off-by: mrpa --- .../doc/automation_framework_test_harness.xml | 94 ++++++++++--- .../doc/appendix_5.xml | 2 + .../doc/sample_test_cases.xml | 149 +++++++++++++++++---- 3 files changed, 203 insertions(+), 42 deletions(-) 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 5088e9c..08fb569 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 @@ -490,7 +490,9 @@ OK $ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s fortigateCleanup.json -d "Fortigate cleanup scenario" - Setting the console logging level to INFO: consoleLoggingLevel = logging.INFO + Setting the console logging level to INFO: + + consoleLoggingLevel = logging.INFO Expected Output: @@ -580,7 +582,9 @@ Options: file: { - "name": " intelc3850-2", + "name": "intelc3850-2", + "deviceId": "intelc3850-2", + "deviceGroupingTags": " ", "description": "", "address": "192.168.1.100", "port": "22", @@ -588,8 +592,10 @@ Options: "password": "root", "certificate": null, "passphrase": null, + "callHome": "false", "maintMode": "false" -} +} +
@@ -796,18 +802,22 @@ Mandatory options: Sample intelc3850-2.json configuration file: - + { -"name": "intelc3850-2", -"description": "", -"address": "172.24.12.114", -"port": "22", -"username": "root", -"password": "root", -"certificate": null, -"passphrase": null, -"maintMode": "false" - } + "name": "intelc3850-2", + "deviceId": "intelc3850-2", + "deviceGroupingTags": " ", + "description": "", + "address": "192.168.1.100", + "port": "22", + "username": "root", + "password": "root", + "certificate": null, + "passphrase": null, + "callHome": "false", + "maintMode": "false" +} +
@@ -1631,11 +1641,11 @@ License("vnf_config/fortigateImage/fortigateLicense.lic") If a sequence of commands aiming to change the state of the VNF - (start/stop/suspend/shutdown) is issued rapidly, certain VNFs might become - unresponsive. Depending on the actual VNF, the time required between - life-cycle operations may vary from several seconds to half a minute - or even more. If a VNF becomes unresponsive, the only possible action - is to "Force Delete" the instance from the uCPE Manager. + (start/stop/suspend/shutdown) is issued rapidly, certain VNFs might + become unresponsive. Depending on the actual VNF, the time required + between life-cycle operations may vary from several seconds to half a + minute or even more. If a VNF becomes unresponsive, the only possible + action is to "Force Delete" the instance from the uCPE Manager.
@@ -2444,6 +2454,52 @@ Options: Mandatory options: -H/--host, -f/--file + Uploading an offline configuration store to a uCPE Device + using the command line: + + python uploadConfigStore.py -h +Usage: uploadConfigStore.py [options] + +Upload offline configuration to uCPE Device. + +Options: + --version show program's version number and exit + -h, --help show this help message and exit + -u USERNAME, --username=USERNAME + Enea uCPE Manager login username + -p PASSWORD, --password=PASSWORD + Enea uCPE Manager login password + -H HOST, --host=HOST Enea uCPE Manager host name or IP address + -s STORE, --store=STORE + Offline config store name + -d DEVICE, --device=DEVICE + Device Name + + Mandatory options: + -H/--host, -s/--store, -d/--device + + Checking the upload of an offline configuration store to a uCPE + Device using the command line: + + python getUploadStatus.py -h +Usage: getUploadStatus.py [options] + +Get upload offline configure status on uCPE Device. + +Options: + --version show program's version number and exit + -h, --help show this help message and exit + -u USERNAME, --username=USERNAME + Enea uCPE Manager login username + -p PASSWORD, --password=PASSWORD + Enea uCPE Manager login password + -H HOST, --host=HOST Enea uCPE Manager host name or IP address + -d DEVICE, --device=DEVICE + Device Name + + Mandatory options: + -H/--host, -d/--device + Removing a config store in the Enea uCPE Manager using the command line: diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml index ea99e4f..71dee09 100644 --- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml +++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml @@ -27,6 +27,7 @@ > cat lab_config/trgt-1/target.json { "name": "inteld1521-17", + "deviceGroupingTags": " ", "description": "trgt", "address": "172.24.8.62", "port": "830", @@ -34,6 +35,7 @@ "password": "", "certificate": null, "passphrase": null, + "callHome": "false", "maintMode": "false", "version": "2.2.3", "deviceId": "inteld1521-17" diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml index b55b9bc..6e54bd4 100644 --- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml +++ b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml @@ -304,29 +304,30 @@ Duplicate entry - Release already installed - The playbook imports the previously described playbooks: - - - - playbooks/waitDeviceUp.yml - - - - playbook/uploadImage.yml - + The playbook imports the previously described + playbooks: - - playbook/installAndActivate.yml - + + + playbooks/waitDeviceUp.yml + - - playbook/deleteUpgradeFile.yml - + + playbook/uploadImage.yml + - - playbook/clearCompletedUpgradesInfo.yml - - + + playbook/installAndActivate.yml + + + + playbook/deleteUpgradeFile.yml + + + + playbook/clearCompletedUpgradesInfo.yml + + @@ -340,6 +341,7 @@ Duplicate entry - Release already installed A device JSON configuration file must be created: + <AF-TH-install-dir>/lab_config/<Device-name>/<Device-name>.json @@ -349,9 +351,7 @@ Duplicate entry - Release already installed <Image-path>, <Image-name>, <Upgrade-type>, and the - <Device-name> as extra-vars: - - ansible-playbook playbooks/installNFVAImage.yml -e \ + <Device-name> as extra-vars: ansible-playbook playbooks/installNFVAImage.yml -e \ device="<Device-name>" -e image_path="<Image-path>" -e \ image_name="<Image-name>" -e upgrade_type="<Upgrade-type>" @@ -1000,6 +1000,109 @@ INFO: Done changed. Recreate the Offline Config Store and set the DPDK again if you want to change the state.
+ +
+ Offline Configuration - Upload an offline configuration onto a + uCPE Device + + Description: Uploading an offline + configuration to a uCPE Device. For details please refer to: + + + + <AF-TH-install-dir>/playbooks/uploadConfigStore.yml. + + + + <AF-TH-install-dir>/automation_framework/device/uploadConfigStore.py. + + + + Precondition: + + + + The Offline Configuration Store should exist in the uCPE + Manager. + + + + The device should be connected to the uCPE Manager. + + + + Action: Run the + uploadConfigStore.yml Ansible Playbook with the + <store-name> and + <device-name> as extra-vars: + + ansible-playbook playbooks/uploadConfigStore.yml -e \ +"store=<store-name> device=<device-name>" + + Result: Output of the test case + run using the Test Harness: + + # Upload Config Store task result **************************** + * localhost - changed=False --------------- + 2020-10-08 13:29:41,062 - INFO: Upload offline \ + configuration to uCPE Device + 2020-10-08 13:30:01,315 - INFO: The '<store-name>' config \ + store was successfully uploaded on device! + 2020-10-08 13:30:01,316 - INFO: Done +
+ +
+ Offline Configuration - Get the offline configuration upload + status on the uCPE Device + + Description: Get the offline + configuration upload status to a uCPE Device. For details please refer + to: + + + + <AF-TH-install-dir>/playbooks/getUploadStatus.yml. + + + + <AF-TH-install-dir>/automation_framework/device/getUploadStatus.py. + + + + Precondition: + + + + An upload of the offline configuration should be done on the + uCPE Device. + + + + The device should be connected to the uCPE Manager. + + + + Action: Run the + getUploadStatus.yml Ansible Playbook with the + <device-name> as extra-vars: + + ansible-playbook playbooks/getUploadStatus.yml -e \ +"device=<device-name>" + + Result: Output of the test case + run using the Test Harness: + + # Upload Config Store task result **************************** + * localhost - changed=False --------------- + 2020-10-08 14:13:24,422 - INFO: Get upload offline configure \ + status on uCPE Device + 2020-10-08 14:13:24,521 - INFO: Successful: True + 2020-10-08 14:13:24,522 - INFO: Store name: <store-name> + 2020-10-08 14:13:24,523 - INFO: In progress: False + 2020-10-08 14:13:24,524 - INFO: A config store was successfully \ + uploaded on device! + 2020-10-08 14:13:24,525 - INFO: Done +
-- cgit v1.2.3-54-g00ecf