diff options
Diffstat (limited to 'csit/tests')
| -rw-r--r-- | csit/tests/cm-handle-query/cm-handle-query.robot | 6 | ||||
| -rw-r--r-- | csit/tests/cps-admin/cps-admin.robot | 4 | ||||
| -rw-r--r-- | csit/tests/cps-data-operations/cps-data-operations.robot | 4 | ||||
| -rw-r--r-- | csit/tests/cps-data-sync/cps-data-sync.robot | 6 | ||||
| -rw-r--r-- | csit/tests/cps-data/cps-data.robot | 7 | ||||
| -rw-r--r-- | csit/tests/cps-model-sync/cps-model-sync.robot | 3 | ||||
| -rw-r--r-- | csit/tests/ncmp-passthrough/ncmp-passthrough.robot | 26 |
7 files changed, 22 insertions, 34 deletions
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 bcab3a679b..f506b28011 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 @@ -69,7 +69,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 |