aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plans/vfc-nfvo-catalog/sanity-check/setup.sh2
-rw-r--r--tests/vfc/nfvo-catalog/test.robot25
2 files changed, 22 insertions, 5 deletions
diff --git a/plans/vfc-nfvo-catalog/sanity-check/setup.sh b/plans/vfc-nfvo-catalog/sanity-check/setup.sh
index 07e2b6af..344214ff 100644
--- a/plans/vfc-nfvo-catalog/sanity-check/setup.sh
+++ b/plans/vfc-nfvo-catalog/sanity-check/setup.sh
@@ -64,9 +64,11 @@ for i in {1..10}; do
sleep $i
done
+# print catalog config
docker cp vfc-catalog:/service/vfc/nfvo/catalog/catalog/pub/config/config.py ./
cat config.py
+# print catalog log
docker cp vfc-catalog:/service/vfc/nfvo/catalog/logs/runtime_catalog.log ./
cat runtime_catalog.log
diff --git a/tests/vfc/nfvo-catalog/test.robot b/tests/vfc/nfvo-catalog/test.robot
index 4fb24c82..af7b8874 100644
--- a/tests/vfc/nfvo-catalog/test.robot
+++ b/tests/vfc/nfvo-catalog/test.robot
@@ -7,20 +7,25 @@ Library json
Library HttpLibrary.HTTP
*** Variables ***
-@{return_ok_list}= 200 201 202
+@{return_ok_list}= 200 201 202 204
+${catalog_port} 8806
${queryswagger_url} /api/catalog/v1/swagger.json
${queryVNFPackage_url} /api/catalog/v1/vnfpackages
${queryNSPackages_url} /api/catalog/v1/nspackages
${healthcheck_url} /api/catalog/v1/health_check
${create_subs_url} /api/vnfpkgm/v1/subscriptions
+${delete_subs_url} /api/vnfpkgm/v1/subscriptions
#json files
${vnf_subscription_json} ${SCRIPTS}/../tests/vfc/nfvo-catalog/jsons/vnf_subscription.json
+#global variables
+${subscriptionId}
+
*** Test Cases ***
GetVNFPackages
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${CATALOG_IP}:8806 headers=${headers}
+ Create Session web_session http://${CATALOG_IP}:${catalog_port} headers=${headers}
${resp}= Get Request web_session ${queryVNFPackage_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
@@ -28,7 +33,7 @@ GetVNFPackages
CatalogHealthCheckTest
[Documentation] check health for catalog by MSB
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${CATALOG_IP}:8806 headers=${headers}
+ Create Session web_session http://${CATALOG_IP}:${catalog_port} headers=${headers}
${resp}= Get Request web_session ${healthcheck_url}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
@@ -41,11 +46,21 @@ CreateVnfSubscriptionTest
${json_value}= json_from_file ${vnf_subscription_json}
${json_string}= string_from_json ${json_value}
${headers} Create Dictionary Content-Type=application/json Accept=application/json
- Create Session web_session http://${CATALOG_IP}:8806 headers=${headers}
+ Create Session web_session http://${CATALOG_IP}:${catalog_port} headers=${headers}
Set Request Body ${json_string}
${resp}= Post Request web_session ${create_subs_url} ${json_string}
${responese_code}= Convert To String ${resp.status_code}
List Should Contain Value ${return_ok_list} ${responese_code}
${response_json} json.loads ${resp.content}
${callback_uri}= Convert To String ${response_json['callbackUri']}
- Should Be Equal ${callback_uri} http://127.0.0.1:8806/api/catalog/v1/callback_sample
+ Should Be Equal ${callback_uri} http://127.0.0.1:${catalog_port}/api/catalog/v1/callback_sample
+ ${subscriptionId}= Convert To String ${response_json['id']}
+ Set Global Variable ${subscriptionId}
+
+DeleteVnfSubscriptionTest
+ [Documentation] Delete Vnf Subscription function test
+ ${headers} Create Dictionary Content-Type=application/json Accept=application/json
+ Create Session web_session http://${CATALOG_IP}:${catalog_port} headers=${headers}
+ ${resp}= Delete Request web_session ${delete_subs_url}/${subscriptionId}
+ ${responese_code}= Convert To String ${resp.status_code}
+ List Should Contain Value ${return_ok_list} ${responese_code}