summaryrefslogtreecommitdiffstats
path: root/test/csit/tests
diff options
context:
space:
mode:
Diffstat (limited to 'test/csit/tests')
-rw-r--r--test/csit/tests/aai/resources/suite1/pserver.robot39
-rw-r--r--test/csit/tests/appc/healthcheck/test1.robot5
-rw-r--r--test/csit/tests/cli/startup/startup_check.robot2
3 files changed, 25 insertions, 21 deletions
diff --git a/test/csit/tests/aai/resources/suite1/pserver.robot b/test/csit/tests/aai/resources/suite1/pserver.robot
index 5a1d9d3ba..55e57bccb 100644
--- a/test/csit/tests/aai/resources/suite1/pserver.robot
+++ b/test/csit/tests/aai/resources/suite1/pserver.robot
@@ -5,62 +5,61 @@ Library requests
Library Collections
*** Variables ***
-${TARGETURL} https://${HOST_IP}:8443/v11/cloud-infrastructure/pservers/pserver/pserver-test1
+${TARGETURL} https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/pserver-test1
${PSERVERDATA} {"hostname": "pserver-test1"}
*** Test Cases ***
Run AAI Put Pserver
- [Documentation] Create an index and verify success
+ [Documentation] Create an pserver object
${resp}= PutWithCert ${TARGETURL} ${PSERVERDATA}
+ log ${TARGETURL}
+ log ${resp.text}
Should Be Equal As Strings ${resp.status_code} 201
Run AAI Get Pserver
- [Documentation] Get the document that was just created
+ [Documentation] Get the pserver object just created
${resp} GetWithCert ${TARGETURL}
- ${content}= Evaluate $resp.json()
+ log ${resp}
+ log ${resp.json()}
Should Be Equal As Strings ${resp.status_code} 200
- ${resource_version}= Evaluate $resp.json()['resource-version']
+ ${resource_version}= Evaluate $resp.json().get('resource-version')
+ Set Global Variable ${resource_version}
Run AAI Delete Pserver
- [Documentation] Delete the index
+ [Documentation] Delete the pserver just created
${resp}= DeleteWithCert ${TARGETURL}?resource-version=${resource_version}
+ log ${resp.text}
Should Be Equal As Strings ${resp.status_code} 204
*** Keywords ***
PutWithCert
[Arguments] ${url} ${data}
- ${auth}= Create List AAI AAI
- ${uuid}= Generate UUID
- ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${uuid} X-FromAppId=integration-aai
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=integration-aai X-FromAppId=integration-aai Authorization=Basic QUFJOkFBSQ==
${certinfo}= Evaluate ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
- ${resp}= Evaluate requests.put('${url}', data='${data}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False) requests
+ ${resp}= Evaluate requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False) requests
[return] ${resp}
PostWithCert
[Arguments] ${url} ${data}
${auth}= Create List AAI AAI
- ${uuid}= Generate UUID
- ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${uuid} X-FromAppId=integration-aai
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=integration-aai X-FromAppId=integration-aai Authorization=Basic QUFJOkFBSQ==
${certinfo}= Evaluate ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
- ${resp}= Evaluate requests.post('${url}', data='${data}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False) requests
+ ${resp}= Evaluate requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False) requests
[return] ${resp}
GetWithCert
[Arguments] ${url}
- ${auth}= Create List AAI AAI
- ${uuid}= Generate UUID
- ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${uuid} X-FromAppId=integration-aai
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=integration-aai X-FromAppId=integration-aai Authorization=Basic QUFJOkFBSQ==
${certinfo}= Evaluate ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
- ${resp}= Evaluate requests.get('${url}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False) requests
+ ${resp}= Evaluate requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False) requests
[return] ${resp}
DeleteWithCert
[Arguments] ${url}
${auth}= Create List AAI AAI
- ${uuid}= Generate UUID
- ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${uuid} X-FromAppId=integration-aai
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=integration-aai X-FromAppId=integration-aai Authorization=Basic QUFJOkFBSQ==
${certinfo}= Evaluate ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
- ${resp}= Evaluate requests.delete('${url}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False) requests
+ ${resp}= Evaluate requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False) requests
[return] ${resp}
diff --git a/test/csit/tests/appc/healthcheck/test1.robot b/test/csit/tests/appc/healthcheck/test1.robot
index 05eee5b84..8bd49860b 100644
--- a/test/csit/tests/appc/healthcheck/test1.robot
+++ b/test/csit/tests/appc/healthcheck/test1.robot
@@ -6,6 +6,7 @@ Library Process
${bundle_query} ${SCRIPTS}/bundle_query.sh
${health_check} ${SCRIPTS}/health_check.sh
+${db_query} ${SCRIPTS}/db_query.sh
*** Test Cases ***
@@ -19,4 +20,8 @@ Query bundle test case for APPC
${result_bq}= Run Process bash ${bundle_query} > log_bq.txt shell=yes
Should Be Equal As Integers ${result_bq.rc} 0
+Query database test case for APPC
+ [Documentation] Query database
+ ${result_db}= Run Process bash ${db_query} > log_db.txt shell=yes
+ Should Be Equal As Integers ${result_db.rc} 0
diff --git a/test/csit/tests/cli/startup/startup_check.robot b/test/csit/tests/cli/startup/startup_check.robot
index a10467078..053a6d115 100644
--- a/test/csit/tests/cli/startup/startup_check.robot
+++ b/test/csit/tests/cli/startup/startup_check.robot
@@ -20,7 +20,7 @@ Check Cli help
${cli_cmd_output}= Run Process ${cli_exec} --help shell=yes
Log ${cli_cmd_output.stdout}
Should Be Equal As Strings ${cli_cmd_output.rc} 0
- Should Contain ${cli_cmd_output.stdout} ONAP Command-line interface
+ Should Contain ${cli_cmd_output.stdout} CLI version
Check Cli Version Default
[Documentation] check cli default version