diff options
| -rwxr-xr-x | test/csit/plans/integration/vCPE/setup.sh | 12 | ||||
| -rwxr-xr-x | test/csit/plans/integration/vCPE/teardown.sh | 3 | ||||
| -rw-r--r-- | test/csit/plans/integration/vCPE/testplan.txt | 3 | ||||
| -rw-r--r-- | test/csit/tests/integration/vCPE/__init__.robot | 2 | ||||
| -rw-r--r-- | test/csit/tests/integration/vCPE/test1.robot | 10 |
5 files changed, 19 insertions, 11 deletions
diff --git a/test/csit/plans/integration/vCPE/setup.sh b/test/csit/plans/integration/vCPE/setup.sh index c18f62207..a30b9b62f 100755 --- a/test/csit/plans/integration/vCPE/setup.sh +++ b/test/csit/plans/integration/vCPE/setup.sh @@ -15,20 +15,18 @@ # limitations under the License. # # Place the scripts in run order: -source ${WORKSPACE}/test/csit/scripts/integration/script1.sh -docker run --name i-mock -d jamesdbloom/mockserver -MOCK_IP=`get-instance-ip.sh i-mock` +run-instance.sh nexus3.onap.org:10001/openecomp/mso i-so "" + +SO_IP=`get-instance-ip.sh i-so` # Wait for initialization for i in {1..10}; do - curl -sS ${MOCK_IP}:1080 && break + curl -sS ${SO_IP}:8080 && break echo sleep $i sleep $i done -${WORKSPACE}/test/csit/scripts/integration/mock-hello.sh ${MOCK_IP} - # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP}" +ROBOT_VARIABLES="-v SO_IP:${SO_IP}" diff --git a/test/csit/plans/integration/vCPE/teardown.sh b/test/csit/plans/integration/vCPE/teardown.sh index acf2d0976..b19785972 100755 --- a/test/csit/plans/integration/vCPE/teardown.sh +++ b/test/csit/plans/integration/vCPE/teardown.sh @@ -15,6 +15,5 @@ # limitations under the License. # -kill-instance.sh i-mock - +kill-instance.sh i-so diff --git a/test/csit/plans/integration/vCPE/testplan.txt b/test/csit/plans/integration/vCPE/testplan.txt index 7a29ca53d..2b3d4ad5d 100644 --- a/test/csit/plans/integration/vCPE/testplan.txt +++ b/test/csit/plans/integration/vCPE/testplan.txt @@ -1,4 +1,3 @@ # Test suites are relative paths under [integration.git]/test/csit/tests/. # Place the suites in run order. -integration/suite1 -integration/suite2 +integration/vCPE diff --git a/test/csit/tests/integration/vCPE/__init__.robot b/test/csit/tests/integration/vCPE/__init__.robot new file mode 100644 index 000000000..b2057b0d1 --- /dev/null +++ b/test/csit/tests/integration/vCPE/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation Integration - vCPE diff --git a/test/csit/tests/integration/vCPE/test1.robot b/test/csit/tests/integration/vCPE/test1.robot new file mode 100644 index 000000000..c9820a4f1 --- /dev/null +++ b/test/csit/tests/integration/vCPE/test1.robot @@ -0,0 +1,10 @@ +*** Settings *** +Library OperatingSystem +Library RequestsLibrary + +*** Test Cases *** +SO ServiceInstance health check + Create Session refrepo http://${SO_IP}:8080 + &{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json + ${resp}= Get Request refrepo /ecomp/mso/infra/orchestrationRequests/v2 headers=${headers} + Should Not Contain ${resp.content} null |