diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-03-08 17:24:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-08 17:24:08 +0000 |
| commit | e892396f90dc313b8cccfce589f9bc9b0c6855b5 (patch) | |
| tree | f92daf873d7ac309d773cee5b666f5c51c080de6 /test/csit | |
| parent | 7f352db1de725cece749d9de1ffe5fc0e48296f0 (diff) | |
| parent | 0b1989ba27a0aacae10fcd65a760728d6d54d658 (diff) | |
Merge "Resolve docker version issue"
Diffstat (limited to 'test/csit')
| -rw-r--r-- | test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh | 2 | ||||
| -rw-r--r-- | test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh index e04feac41..1c3e4e83a 100644 --- a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh +++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh @@ -23,7 +23,7 @@ docker run -d -i -t --name=postgres -p 5432:5432 nexus3.onap.org:10001/onap/re POSTGRES=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' postgres` #Start market place -docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest +docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.1-STAGING-latest # Wait for Market place initialization echo Wait for VNF Repository initialization diff --git a/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot b/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot index c57642a2e..01ece239f 100644 --- a/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot +++ b/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot @@ -15,7 +15,7 @@ ${csarId} 0 Upload VNF Package to VNF Repository [Documentation] Upload the VNF Package - ${resp}= Run curl -s -X POST -H "Content-Type: multipart/form-data" -F "file=@${csarpath}" http://${REPO_IP}:8702/openoapi/vnfsdk-marketplace/v1/PackageResource/csars + ${resp}= Run curl -s -X POST -H "Content-Type: multipart/form-data" -F "file=@${csarpath}" http://${REPO_IP}:8702/onapapi/vnfsdk-marketplace/v1/PackageResource/csars Should Contain ${resp} csarId ${csarjson}= Evaluate ${resp} ${csarId}= Set Variable ${csarjson["csarId"]} @@ -24,7 +24,7 @@ Upload VNF Package to VNF Repository Get VNF Package Information from Repository Create Session refrepo http://${REPO_IP}:8702 &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Get Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers} + ${resp}= Get Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers} ${response_json} json.loads ${resp.content} ${downloadUri}= Convert To String ${response_json['downloadUri']} Should Contain ${downloadUri} ${csarId} @@ -33,16 +33,16 @@ Get VNF Package Information from Repository Get List Of Requests Create Session refrepo http://${REPO_IP}:8702 &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Get Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars?name=enterprise2DC&version=1.0&type=SSAR&provider=huawei headers=${headers} + ${resp}= Get Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars?name=enterprise2DC&version=1.0&type=SSAR&provider=huawei headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 Download VNF Package from Repository Create Session refrepo http://${REPO_IP}:8702 &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Get Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files headers=${headers} + ${resp}= Get Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 ${downloadUri}= Convert To String ${resp.content} - ${downloadUri1}= Run curl http://${REPO_IP}:8702/openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files + ${downloadUri1}= Run curl http://${REPO_IP}:8702/onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId}/files ${string}= Convert To String ${downloadUri1} Should Contain ${downloadUri1} ' % Total % Received % Xferd Average Should Contain ${string} ' % Total % Received % Xferd Average @@ -50,6 +50,6 @@ Download VNF Package from Repository Delete VNF Package from Repository Create Session refrepo http://${REPO_IP}:8702 &{headers}= Create Dictionary Content-Type=application/json - ${resp}= Delete Request refrepo /openoapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers} + ${resp}= Delete Request refrepo /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/${csarId} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 |