diff options
| author |   JvD_Ericsson <jeff.van.dam@est.tech> | 2023-12-07 15:33:09 +0000 |
|---|---|---|
| committer | JvD_Ericsson <jeff.van.dam@est.tech> | 2023-12-12 10:37:19 +0000 |
| commit | 14d37304d8b83efc099ba19d6f3e7d5d53fead29 (patch) | |
| tree | 5aac3fa33056f1d85be4b77a0c2809862569dee5 | |
| parent | 93f2c3ff203d78d8cddae7878d16fe2f55661655 (diff) | |
Clean up CSIT Test
- Removed gitignore from csit and made it top level
- Removed tabs from all files
- Created sub-folder for cps-core and ncmp in the data folder
- Deleted csit/data/postModuleRequestBody.json, was not used
- Removed setting variable for most response.json() calls
Issue-Id: CPS-734
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I32fd5b4f5a0132987a4684c336846b86df7b49e7
20 files changed, 30 insertions, 52 deletions
diff --git a/.gitignore b/.gitignore index c59fc4731d..5f77b3b0a6 100755 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,6 @@ tmp/ /docs/_build/* /test-tools/metrics-reports/ + +csit/env.properties +csit/archives/ diff --git a/csit/.gitignore b/csit/.gitignore deleted file mode 100644 index c8865c25ec..0000000000 --- a/csit/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -env.properties -archives/ diff --git a/csit/data/dataOperationRequest.json b/csit/data/cps-core/dataOperationRequest.json index 1b94a299dc..1b94a299dc 100644 --- a/csit/data/dataOperationRequest.json +++ b/csit/data/cps-core/dataOperationRequest.json diff --git a/csit/data/test-tree.json b/csit/data/cps-core/test-tree.json index 8f4b522799..8f4b522799 100644 --- a/csit/data/test-tree.json +++ b/csit/data/cps-core/test-tree.json diff --git a/csit/data/test-tree.yang b/csit/data/cps-core/test-tree.yang index faba8a11d4..faba8a11d4 100644 --- a/csit/data/test-tree.yang +++ b/csit/data/cps-core/test-tree.yang diff --git a/csit/data/testTreePatchExample.json b/csit/data/cps-core/testTreePatchExample.json index 31210b6289..31210b6289 100644 --- a/csit/data/testTreePatchExample.json +++ b/csit/data/cps-core/testTreePatchExample.json diff --git a/csit/data/yang-resources.zip b/csit/data/cps-core/yang-resources.zip Binary files differindex 42b110d5c6..42b110d5c6 100644 --- a/csit/data/yang-resources.zip +++ b/csit/data/cps-core/yang-resources.zip diff --git a/csit/data/bookstoreCreateExample.json b/csit/data/ncmp/bookstoreCreateExample.json index ff8e202e30..ff8e202e30 100644 --- a/csit/data/bookstoreCreateExample.json +++ b/csit/data/ncmp/bookstoreCreateExample.json diff --git a/csit/data/bookstorePatchExample.json b/csit/data/ncmp/bookstorePatchExample.json index 039ea4bcdd..039ea4bcdd 100644 --- a/csit/data/bookstorePatchExample.json +++ b/csit/data/ncmp/bookstorePatchExample.json diff --git a/csit/data/bookstoreUpdateExample.json b/csit/data/ncmp/bookstoreUpdateExample.json index 2614b59222..2614b59222 100644 --- a/csit/data/bookstoreUpdateExample.json +++ b/csit/data/ncmp/bookstoreUpdateExample.json diff --git a/csit/data/postModuleRequestBody.json b/csit/data/postModuleRequestBody.json deleted file mode 100644 index e12af9d916..0000000000 --- a/csit/data/postModuleRequestBody.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "operation": "read", - "data": { - "modules": [ - { - "name": "nc-notifications", - "revision": "2008-07-14" - } - ] - } -}
\ No newline at end of file diff --git a/csit/plans/cps/pnfsim/netconf-config/stores.yang b/csit/plans/cps/pnfsim/netconf-config/stores.yang index 59051f2a28..56ad95c8d5 100644 --- a/csit/plans/cps/pnfsim/netconf-config/stores.yang +++ b/csit/plans/cps/pnfsim/netconf-config/stores.yang @@ -6,8 +6,8 @@ module stores { prefix book-store; - import ietf-yang-types { prefix yang; } - import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } + import ietf-inet-types { prefix inet; } revision "2020-09-15" { description @@ -51,10 +51,10 @@ module stores { type string; } leaf pub_year { - type year; + type year; } leaf price { - type uint64; + type uint64; } } } diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index bba48794fe..c4e5c153d9 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -129,4 +129,4 @@ check_health $DMI_HOST:$DMI_PORT 'dmi-plugin' ###################### ROBOT Configurations ########################## # Pass variables required for Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_CSIT_STUB_HOST:$LOCAL_IP -v DMI_CSIT_STUB_PORT:$DMI_DEMO_STUB_PORT -v DMI_AUTH_ENABLED:$DMI_AUTH_ENABLED -v DATADIR:$WORKSPACE/data -v DATADIR_SUBS_NOTIFICATION:$WORKSPACE/data/subscription-notification --exitonfailure"
\ No newline at end of file +ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v DMI_CSIT_STUB_HOST:$LOCAL_IP -v DMI_CSIT_STUB_PORT:$DMI_DEMO_STUB_PORT -v DMI_AUTH_ENABLED:$DMI_AUTH_ENABLED -v DATADIR_CPS_CORE:$WORKSPACE/data/cps-core -v DATADIR_NCMP:$WORKSPACE/data/ncmp -v DATADIR_SUBS_NOTIFICATION:$WORKSPACE/data/subscription-notification --exitonfailure"
\ No newline at end of file diff --git a/csit/tests/cm-handle-query/cm-handle-query.robot b/csit/tests/cm-handle-query/cm-handle-query.robot index 3adc25362c..4941cde077 100644 --- a/csit/tests/cm-handle-query/cm-handle-query.robot +++ b/csit/tests/cm-handle-query/cm-handle-query.robot @@ -41,17 +41,15 @@ Retrieve CM Handle ids where query parameters Match (module and property query) ${uri}= Set Variable ${ncmpBasePath}/ch/id-searches ${headers}= Create Dictionary Content-Type=application/json Authorization=${auth} ${response}= POST On Session CPS_URL ${uri} headers=${headers} data=${jsonModuleAndPropertyQueryParameters} - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 - Should Contain ${responseJson} PNFDemo + Should Contain ${response.json()} PNFDemo Retrieve CM Handle ids where query parameters Match (empty query) ${uri}= Set Variable ${ncmpBasePath}/ch/id-searches ${headers}= Create Dictionary Content-Type=application/json Authorization=${auth} ${response}= POST On Session CPS_URL ${uri} headers=${headers} data=${jsonEmptyQueryParameters} - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 - Should Contain ${responseJson} PNFDemo + Should Contain ${response.json()} PNFDemo Throw 400 when Structure of Request is Incorrect ${uri}= Set Variable ${ncmpBasePath}/ch/id-searches diff --git a/csit/tests/cps-admin/cps-admin.robot b/csit/tests/cps-admin/cps-admin.robot index a075788ff4..cf7a90c4ac 100644 --- a/csit/tests/cps-admin/cps-admin.robot +++ b/csit/tests/cps-admin/cps-admin.robot @@ -46,7 +46,7 @@ Create Dataspace Create Schema Set from YANG file ${uri}= Set Variable ${basePath}/v1/dataspaces/${dataspaceName}/schema-sets ${params}= Create Dictionary schema-set-name=${schemaSetName} - ${fileData}= Get Binary File ${DATADIR}${/}test-tree.yang + ${fileData}= Get Binary File ${DATADIR_CPS_CORE}${/}test-tree.yang ${fileTuple}= Create List test.yang ${fileData} application/zip &{files}= Create Dictionary file=${fileTuple} ${headers}= Create Dictionary Authorization=${auth} @@ -56,7 +56,7 @@ Create Schema Set from YANG file Create Schema Set from ZIP file ${uri}= Set Variable ${basePath}/v1/dataspaces/${dataspaceName}/schema-sets ${params}= Create Dictionary schema-set-name=ZipTestSchemaSet - ${fileData}= Get Binary File ${DATADIR}${/}yang-resources.zip + ${fileData}= Get Binary File ${DATADIR_CPS_CORE}${/}yang-resources.zip ${fileTuple}= Create List test.zip ${fileData} application/zip &{files}= Create Dictionary file=${fileTuple} ${headers}= Create Dictionary Authorization=${auth} diff --git a/csit/tests/cps-data-operations/cps-data-operations.robot b/csit/tests/cps-data-operations/cps-data-operations.robot index 9ede0f25c7..d0206d19b1 100644 --- a/csit/tests/cps-data-operations/cps-data-operations.robot +++ b/csit/tests/cps-data-operations/cps-data-operations.robot @@ -42,11 +42,11 @@ ${newCmHandleRequestBody} {"dmiPlugin":"${dmipluginCsitStubUrl}"," NCMP Data Operation, forwarded to DMI, response on Client Topic ${uri}= Set Variable ${ncmpBasePath}/v1/data - ${dataOperationReqBody}= Get Binary File ${DATADIR}${/}dataOperationRequest.json + ${dataOperationReqBody}= Get Binary File ${DATADIR_CPS_CORE}${/}dataOperationRequest.json ${params}= Create Dictionary topic=${topic} ${headers}= Create Dictionary Content-Type=application/json Authorization=${auth} POST On Session CPS_URL ncmpInventory/v1/ch headers=${headers} data=${newCmHandleRequestBody} - Sleep 5 wait some time to get updated the cm handle state to READY + Sleep 8 wait some time to get updated the cm handle state to READY ${response}= POST On Session CPS_URL ${uri} params=${params} headers=${headers} data=${dataOperationReqBody} Set Global Variable ${expectedRequestId} ${response.json()}[requestId] Should Be Equal As Strings ${response.status_code} 200 diff --git a/csit/tests/cps-data-sync/cps-data-sync.robot b/csit/tests/cps-data-sync/cps-data-sync.robot index d37125b150..e96e10a42f 100644 --- a/csit/tests/cps-data-sync/cps-data-sync.robot +++ b/csit/tests/cps-data-sync/cps-data-sync.robot @@ -43,13 +43,11 @@ Operational state goes to UNSYNCHRONIZED when data sync (flag) is enabled ${verifyUri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/state ${verifyHeaders}= Create Dictionary Authorization=${auth} ${verifyResponse}= GET On Session CPS_URL ${verifyUri} headers=${verifyHeaders} - ${verifyResponseJson}= Set Variable ${verifyResponse.json()['state']['dataSyncState']['operational']} - Should Be Equal As Strings ${verifyResponseJson['syncState']} UNSYNCHRONIZED + Should Be Equal As Strings ${verifyResponse.json()['state']['dataSyncState']['operational']['syncState']} UNSYNCHRONIZED Sleep 5 Operational state goes to SYNCHRONIZED after sometime when data sync (flag) is enabled ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/state ${headers}= Create Dictionary Authorization=${auth} ${response}= GET On Session CPS_URL ${uri} headers=${headers} - ${responseJson}= Set Variable ${response.json()['state']['dataSyncState']['operational']} - Should Be Equal As Strings ${responseJson['syncState']} SYNCHRONIZED
\ No newline at end of file + Should Be Equal As Strings ${response.json()['state']['dataSyncState']['operational']['syncState']} SYNCHRONIZED
\ No newline at end of file diff --git a/csit/tests/cps-data/cps-data.robot b/csit/tests/cps-data/cps-data.robot index ce2033c116..0e3dfabddf 100644 --- a/csit/tests/cps-data/cps-data.robot +++ b/csit/tests/cps-data/cps-data.robot @@ -38,7 +38,7 @@ ${anchorName} CSIT-Anchor Create Data Node ${uri}= Set Variable ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/nodes ${headers} Create Dictionary Content-Type=application/json Authorization=${auth} - ${jsonData}= Get Binary File ${DATADIR}${/}test-tree.json + ${jsonData}= Get Binary File ${DATADIR_CPS_CORE}${/}test-tree.json ${response}= POST On Session CPS_URL ${uri} headers=${headers} data=${jsonData} Should Be Equal As Strings ${response.status_code} 201 @@ -46,7 +46,7 @@ Patch Data Node ${uri}= Set Variable ${basePath}/v1/dataspaces/${dataspaceName}/anchors/${anchorName}/nodes ${params}= Create Dictionary xpath=/test-tree/branch[@name='Right'] ${headers} Create Dictionary Content-Type=application/json Authorization=${auth} - ${jsonData}= Get Binary File ${DATADIR}${/}testTreePatchExample.json + ${jsonData}= Get Binary File ${DATADIR_CPS_CORE}${/}testTreePatchExample.json ${response}= PATCH On Session CPS_URL ${uri} params=${params} headers=${headers} data=${jsonData} Should Be Equal As Strings ${response.status_code} 200 @@ -64,7 +64,6 @@ Get Data Node by XPath ${params}= Create Dictionary xpath=/test-tree/branch[@name='LEFT/left']/nest ${headers}= Create Dictionary Authorization=${auth} ${response}= Get On Session CPS_URL ${uri} params=${params} headers=${headers} expected_status=200 - ${responseJson}= Set Variable ${response.json()['tree:nest']} - Should Be Equal As Strings ${responseJson['name']} SMALL/small + Should Be Equal As Strings ${response.json()['tree:nest']['name']} SMALL/small diff --git a/csit/tests/cps-model-sync/cps-model-sync.robot b/csit/tests/cps-model-sync/cps-model-sync.robot index 8554e26e9f..519c7a7270 100644 --- a/csit/tests/cps-model-sync/cps-model-sync.robot +++ b/csit/tests/cps-model-sync/cps-model-sync.robot @@ -80,9 +80,8 @@ Get modules for registered data node ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/modules ${headers}= Create Dictionary Authorization=${auth} ${response}= GET On Session CPS_URL ${uri} headers=${headers} - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 - FOR ${item} IN @{responseJson} + FOR ${item} IN @{response.json()} IF "${item['moduleName']}" == "stores" Should Be Equal As Strings "${item['revision']}" "2020-09-15" END diff --git a/csit/tests/ncmp-passthrough/ncmp-passthrough.robot b/csit/tests/ncmp-passthrough/ncmp-passthrough.robot index 95a8d535c7..2385d22c6f 100644 --- a/csit/tests/ncmp-passthrough/ncmp-passthrough.robot +++ b/csit/tests/ncmp-passthrough/ncmp-passthrough.robot @@ -40,7 +40,6 @@ Get for Passthrough Operational (CF, RO) with fields & topic ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-operational?resourceIdentifier=ietf-netconf-monitoring:netconf-state&options=(fields=schemas/schema)&topic=test-topic ${headers}= Create Dictionary Authorization=${auth} ${response}= Get On Session CPS_URL ${uri} headers=${headers} expected_status=200 - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 Get for Passthrough Operational (CF, RO) with fields @@ -55,7 +54,7 @@ Get for Passthrough Operational (CF, RO) with fields Create to bookstore using passthrough-running ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore ${headers}= Create Dictionary Content-Type=application/json Authorization=${auth} - ${jsonData}= Get Binary File ${DATADIR}${/}bookstoreCreateExample.json + ${jsonData}= Get Binary File ${DATADIR_NCMP}${/}bookstoreCreateExample.json ${response}= POST On Session CPS_URL ${uri} headers=${headers} data=${jsonData} Should Be Equal As Strings ${response.status_code} 201 @@ -63,9 +62,8 @@ Verify create to bookstore using passthrough-running ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore ${headers}= Create Dictionary Authorization=${auth} ${response}= Get On Session CPS_URL ${uri} headers=${headers} - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 - FOR ${item} IN @{responseJson['stores:bookstore']['categories']} + FOR ${item} IN @{response.json()['stores:bookstore']['categories']} IF "${item['code']}" == "01" Should Be Equal As Strings "${item['name']}" "Sci-Fi" Should Be Equal As Strings "${item['books']}[0][title]" "A Sci-Fi book" @@ -79,7 +77,7 @@ Verify create to bookstore using passthrough-running Update Bookstore using passthrough-running for Category 01 ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore/categories=01 ${headers}= Create Dictionary Content-Type=application/json Authorization=${auth} - ${jsonData}= Get Binary File ${DATADIR}${/}bookstoreUpdateExample.json + ${jsonData}= Get Binary File ${DATADIR_NCMP}${/}bookstoreUpdateExample.json ${response}= PUT On Session CPS_URL ${uri} headers=${headers} data=${jsonData} Should Be Equal As Strings ${response.status_code} 200 @@ -87,9 +85,8 @@ Verify update to bookstore using passthrough-running updated category 01 ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore/categories=01 ${headers}= Create Dictionary Authorization=${auth} ${response}= Get On Session CPS_URL ${uri} headers=${headers} - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 - FOR ${item} IN @{responseJson['stores:categories']} + FOR ${item} IN @{response.json()['stores:categories']} IF "${item['code']}" == "01" Should Be Equal As Strings "${item['name']}" "Updated Sci-Fi Category Name" END @@ -99,9 +96,8 @@ Verify update to bookstore using passthrough-running did not remove category 02 ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore ${headers}= Create Dictionary Authorization=${auth} ${response}= Get On Session CPS_URL ${uri} headers=${headers} - ${responseJson}= Set Variable ${response.json()} Should Be Equal As Strings ${response.status_code} 200 - ${schemaCount}= Get length ${responseJson['stores:bookstore']['categories']} + ${schemaCount}= Get length ${response.json()['stores:bookstore']['categories']} Should Be Equal As Numbers ${schemaCount} 2 Delete Bookstore using passthrough-running for Category 01 @@ -114,11 +110,11 @@ Verify delete to bookstore using passthrough-running removed only category 01 ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore ${headers}= Create Dictionary Authorization=${auth} ${response}= Get On Session CPS_URL ${uri} headers=${headers} - ${responseJson}= Set Variable ${response.json()} + ${responseJson}= Set Variable ${response.json()['stores:bookstore']['categories']} Should Be Equal As Strings ${response.status_code} 200 - ${schemaCount}= Get length ${responseJson['stores:bookstore']['categories']} + ${schemaCount}= Get length ${responseJson} Should Be Equal As Numbers ${schemaCount} 1 - FOR ${item} IN @{responseJson['stores:bookstore']['categories']} + FOR ${item} IN @{responseJson} IF "${item['code']}" == "02" Should Be Equal As Strings "${item['name']}" "Horror" END @@ -127,20 +123,18 @@ Verify delete to bookstore using passthrough-running removed only category 01 Patch will add new category with new book and add a new book to an existing category ${uri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore ${headers}= Create Dictionary Content-Type=application/yang.patch+json Authorization=${auth} - ${jsonData}= Get Binary File ${DATADIR}${/}bookstorePatchExample.json + ${jsonData}= Get Binary File ${DATADIR_NCMP}${/}bookstorePatchExample.json ${response}= PATCH On Session CPS_URL ${uri} headers=${headers} data=${jsonData} Should Be Equal As Strings ${response.status_code} 200 ${verifyUri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore/categories=100 ${verifyHeaders}= Create Dictionary Authorization=${auth} ${verifyResponse}= Get On Session CPS_URL ${verifyUri} headers=${verifyHeaders} - ${responseJson}= Set Variable ${verifyResponse.json()} Should Be Equal As Strings ${verifyResponse.status_code} 200 - FOR ${item} IN @{responseJson['stores:categories']} + FOR ${item} IN @{verifyResponse.json()['stores:categories']} IF "${item['code']}" == "100" Should Be Equal As Strings "${item['name']}" "Category100" END END ${verifyUri}= Set Variable ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore/categories=02/books=A%20New%20book%20in%20existing%20category ${verifyResponse}= Get On Session CPS_URL ${verifyUri} headers=${verifyHeaders} - ${responseJson}= Set Variable ${verifyResponse.json()} Should Be Equal As Strings ${verifyResponse.status_code} 200 |