diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-03-12 16:35:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-12 16:35:54 +0000 |
| commit | 56d1c832a08fc14413bc7e8ec5d3403ebf1d94f2 (patch) | |
| tree | 6b0d13202227badecf3ac952de26e768b89ff2ec /test/csit/tests | |
| parent | 39936a26c3d0a47e145e8df95c06bd682c2a0ce7 (diff) | |
| parent | d280c2636f4eb21cf31095acb0e8e03ac3c47148 (diff) | |
Merge "Rename optf base dir to optf-has"
Diffstat (limited to 'test/csit/tests')
| -rw-r--r-- | test/csit/tests/optf-has/has/__init__.robot (renamed from test/csit/tests/optf/has/__init__.robot) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/data/plan_with_wrong_version.json (renamed from test/csit/tests/optf/has/data/plan_with_wrong_version.json) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/data/plan_without_demand_section.json (renamed from test/csit/tests/optf/has/data/plan_without_demand_section.json) | 0 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/has/optf_has_test.robot (renamed from test/csit/tests/optf/has/optf_has_test.robot) | 19 | ||||
| -rw-r--r-- | test/csit/tests/optf-has/osdf/data/sampletest.txt (renamed from test/csit/tests/optf/osdf/data/sampletest.txt) | 0 |
5 files changed, 14 insertions, 5 deletions
diff --git a/test/csit/tests/optf/has/__init__.robot b/test/csit/tests/optf-has/has/__init__.robot index fb654d7bb..fb654d7bb 100644 --- a/test/csit/tests/optf/has/__init__.robot +++ b/test/csit/tests/optf-has/has/__init__.robot diff --git a/test/csit/tests/optf/has/data/plan_with_wrong_version.json b/test/csit/tests/optf-has/has/data/plan_with_wrong_version.json index 9471fbf82..9471fbf82 100644 --- a/test/csit/tests/optf/has/data/plan_with_wrong_version.json +++ b/test/csit/tests/optf-has/has/data/plan_with_wrong_version.json diff --git a/test/csit/tests/optf/has/data/plan_without_demand_section.json b/test/csit/tests/optf-has/has/data/plan_without_demand_section.json index 87a459d87..87a459d87 100644 --- a/test/csit/tests/optf/has/data/plan_without_demand_section.json +++ b/test/csit/tests/optf-has/has/data/plan_without_demand_section.json diff --git a/test/csit/tests/optf/has/optf_has_test.robot b/test/csit/tests/optf-has/has/optf_has_test.robot index f939bd91a..ab5ded6ca 100644 --- a/test/csit/tests/optf/has/optf_has_test.robot +++ b/test/csit/tests/optf-has/has/optf_has_test.robot @@ -14,7 +14,7 @@ ${generatedPlanId} *** Test Cases *** Check ConductorApi Docker Container - [Documentation] It checks cassandra docker container is running + [Documentation] It checks conductor-api docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -23,7 +23,7 @@ Check ConductorApi Docker Container Should Contain ${output} cond-api Check ConductorController Docker Container - [Documentation] It checks zookeeper docker container is running + [Documentation] It checks conductor-controller docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -32,7 +32,7 @@ Check ConductorController Docker Container Should Contain ${output} cond-cont Check ConductorSolver Docker Container - [Documentation] It checks tomcat docker container is running + [Documentation] It checks conductor-solver docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -40,8 +40,8 @@ Check ConductorSolver Docker Container Should Be Equal As Integers ${rc} 0 Should Contain ${output} cond-solv -Check ConductorReservation War Docker Container - [Documentation] It checks music.war docker container is running +Check ConductorReservation Docker Container + [Documentation] It checks conductor-reservation docker container is running ${rc} ${output}= Run and Return RC and Output docker ps Log To Console ********************* Log To Console retrurn_code = ${rc} @@ -49,6 +49,15 @@ Check ConductorReservation War Docker Container Should Be Equal As Integers ${rc} 0 Should Contain ${output} cond-resv +Check ConductorData Docker Container + [Documentation] It checks conductor-data docker container is running + ${rc} ${output}= Run and Return RC and Output docker ps + Log To Console ********************* + Log To Console retrurn_code = ${rc} + Log To Console output = ${output} + Should Be Equal As Integers ${rc} 0 + Should Contain ${output} cond-data + Get Root Url [Documentation] It sends a REST GET request to root url Create Session optf-cond ${COND_HOSTNAME}:${COND_PORT} diff --git a/test/csit/tests/optf/osdf/data/sampletest.txt b/test/csit/tests/optf-has/osdf/data/sampletest.txt index 9f4e8d7d6..9f4e8d7d6 100644 --- a/test/csit/tests/optf/osdf/data/sampletest.txt +++ b/test/csit/tests/optf-has/osdf/data/sampletest.txt |