Merge "Bbs tests improvements"

diff --git a/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
index 11b86c7..e2ab259 100755 (executable)
--- a/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
+++ b/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
@@ -78,6 +78,8 @@ done
 docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/res/pub/config/config.py ./
 cat config.py
 
+docker logs vfc-vnfres
+
 docker cp vfc-vnfres:/service/vfc/gvnfm/vnfres/res/logs/runtime_res.log ./
 cat runtime_res.log
 

diff --git a/plans/vfc-nfvo-catalog/sanity-check/testplan.txt b/plans/vfc-nfvo-catalog/sanity-check/testplan.txt
index 3c5f813..cce75ed 100644 (file)
--- a/plans/vfc-nfvo-catalog/sanity-check/testplan.txt
+++ b/plans/vfc-nfvo-catalog/sanity-check/testplan.txt
@@ -1,3 +1,4 @@
 # Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-catalog/test.robot
+vfc/nfvo-catalog/Subscriptions.robot

diff --git a/tests/vfc/nfvo-catalog/Subscriptions.robot b/tests/vfc/nfvo-catalog/Subscriptions.robot
new file mode 100644 (file)
index 0000000..b87c20f
--- /dev/null
+++ b/tests/vfc/nfvo-catalog/Subscriptions.robot
@@ -0,0 +1,45 @@
+*** Settings ***
+Resource    ../../common.robot
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
+
+*** Variables ***
+@{return_ok_list}=         200  201  202  204
+${catalog_port}            8806
+${subscriptions_url}         /api/vnfpkgm/v1/subscriptions
+
+#json files
+${vnf_subscription_json}    ${SCRIPTS}/../tests/vfc/nfvo-catalog/jsons/vnf_subscription.json
+
+#global variables
+${subscriptionId}
+
+*** Test Cases ***
+POST Subscription
+    Log    Trying to create a new subscription
+    [Documentation]    Create Vnf Subscription function test
+    ${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}:${catalog_port}    headers=${headers}
+    Set Request Body    ${json_string}
+    ${resp}=    Post Request    web_session     ${subscriptions_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:${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     ${subscriptions_url}/${subscriptionId}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+