diff --git a/SOL009/NFVMANOPerformanceManagement-API/IndividualSubscription.robot b/SOL009/NFVMANOPerformanceManagement-API/IndividualSubscription.robot
deleted file mode 100644
index 90735e18049d63caf84b11bf257d7b5c568f1e77..0000000000000000000000000000000000000000
--- a/SOL009/NFVMANOPerformanceManagement-API/IndividualSubscription.robot
+++ /dev/null
@@ -1,171 +0,0 @@
-*** Settings ***
-Library JSONSchemaLibrary schemas/
-Resource environment/variables.txt # Generic Parameters
-Library REST ${NFVMANO_SCHEMA}://${NFVMANO_HOST}:${NFVMANO_PORT} ssl_verify=false
-Library OperatingSystem
-Library JSONLibrary
-Resource environment/individualSubscription.txt
-
-*** Test Cases ***
-GET Individual Performance Subscription
- [Documentation] Test ID: 8.3.2.7.1
- ... Test title: GET Individual Performance Subscription
- ... Test objective: The objective is to test the retrieval of individual performance subscription and perform a JSON schema validation of the returned subscription data structure.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available in the NFV-MANO.
- ... Reference: clause 6.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Get Individual Performance Subscription
- Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is PmSubscription
- Check HTTP Response Body Subscription Identifier matches the requested Subscription
-
-GET Individual Performance Subscription with invalid resource identifier
- [Documentation] Test ID: 8.3.2.7.2
- ... Test title: GET Individual Performance Subscription with invalid resource identifier
- ... Test objective: The objective is to test that the retrieval of an individual performance subscription fails when using an invalid resource identifier.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available in the NFV-MANO.
- ... Reference: clause 6.5.9.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- GET individual Performance Subscription with invalid resource identifier
- Check HTTP Response Status Code Is 404
-
-DELETE Individual Performance Subscription
- [Documentation] Test ID: 8.3.2.7.3
- ... Test title: DELETE Individual Performance Subscription
- ... Test objective: The objective is to test the deletion of an individual performance subscription
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available in the NFV-MANO.
- ... Reference: clause 6.5.9.3.5 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: The Performance Subscription is not available anymore in the NFV-MANO
- Send Delete request for individual Performance Subscription
- Check HTTP Response Status Code Is 204
- Check Postcondition Performance Subscription is Deleted
-
-DELETE Individual Performance Subscription with invalid resource identifier
- [Documentation] Test ID: 8.3.2.7.4
- ... Test title: DELETE Individual Performance Subscription with invalid resource identifier
- ... Test objective: The objective is to test that the deletion of an individual performance subscription fails when using an invalid resource identifier.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available in the NFV-MANO.
- ... Reference: clause 6.5.9.3.5 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Delete request for individual Performance Subscription with invalid resource identifier
- Check HTTP Response Status Code Is 404
-
-POST Individual Performance Subscription - Method not implemented
- [Documentation] Test ID: 8.3.2.7.5
- ... Test title: POST Individual Performance Subscription - Method not implemented
- ... Test objective: The objective is to test that POST method is not allowed to create a new Performance Subscription
- ... Pre-conditions: none
- ... Reference: clause 6.5.9.3.1 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Post request for individual Performance Subscription
- Check HTTP Response Status Code Is 405
-
-PUT Individual Performance Subscription - Method not implemented
- [Documentation] Test ID: 8.3.2.7.6
- ... Test title: PUT Individual Performance Subscription - Method not implemented
- ... Test objective: The objective is to test that PUT method is not allowed to update an existing Performance subscription.
- ... Pre-conditions: none
- ... Reference: clause 6.5.9.3.3 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Put request for individual Performance Threshold
- Check HTTP Response Status Code Is 405
-
-PATCH Individual Performance Subscription - Method not implemented
- [Documentation] Test ID: 8.3.2.7.7
- ... Test title: PATCH Individual Performance Subscription - Method not implemented
- ... Test objective: The objective is to test that PATCH method is not allowed to modify an existing Performance subscription
- ... Pre-conditions: none
- ... Reference: clause 6.5.9.3.4 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Patch request for individual Performance Threshold
- Check HTTP Response Status Code Is 405
-
-*** Keywords ***
-Check HTTP Response Status Code Is
- [Arguments] ${expected_status}
- Should Be Equal As Strings ${response['status']} ${expected_status}
- Log Status code validated
-
-Check HTTP Response Body Json Schema Is
- [Arguments] ${input}
- Run Keyword If '${input}' == 'ProblemDetails' Should Contain ${response['headers']['Content-Type']} application/problem+json
- ... ELSE Should Contain ${response['headers']['Content-Type']} application/json
- ${schema} = Catenate SEPARATOR= ${input} .schema.json
- Validate Json ${schema} ${response['body']}
- Log Json Schema Validation OK
-
-Get Individual Performance Subscription
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Check HTTP Response Body Subscription Identifier matches the requested Subscription
- Log Trying to check response ID
- Should Be Equal As Strings ${response['body']['id']} ${subscriptionId}
- Log Subscription identifier as expected
-
-GET individual Performance Subscription with invalid resource identifier
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Send Delete request for individual Performance Subscription
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Send Delete request for individual Performance Subscription with invalid resource identifier
- Log Trying to delete a subscription in the NFV-MANO with invalid id
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
- ${output}= Output response
- Set Suite Variable @{response} ${output}
-
-Check Postcondition Performance Subscription is Deleted
- Log Check Postcondition Subscription is deleted
- GET individual Performance Subscription
- Check HTTP Response Status Code Is 404
-
-Send Post request for individual Performance Subscription
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
- ${output}= Output response
- Set Suite Variable @{response} ${output}
-
-Send Put request for individual Performance Threshold
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${origOutput}= Output response
- Set Suite Variable ${origResponse} ${origOutput}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${output}= Output response
- Set Suite Variable @{response} ${output}
-
-Send Patch request for individual Performance Threshold
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${origOutput}= Output response
- Set Suite Variable ${origResponse} ${origOutput}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
- ${output}= Output response
- Set Suite Variable @{response} ${output}
\ No newline at end of file
diff --git a/SOL009/NFVMANOPerformanceManagement-API/Subscriptions.robot b/SOL009/NFVMANOPerformanceManagement-API/Subscriptions.robot
deleted file mode 100644
index d3d2afb1505c725895c1154126fc904eab6fc168..0000000000000000000000000000000000000000
--- a/SOL009/NFVMANOPerformanceManagement-API/Subscriptions.robot
+++ /dev/null
@@ -1,323 +0,0 @@
-*** Settings ***
-Library String
-Library JSONSchemaLibrary schemas/
-Resource environment/variables.txt # Generic Parameters
-Library REST ${NFVMANO_SCHEMA}://${NFVMANO_HOST}:${NFVMANO_PORT} ssl_verify=false
-Library OperatingSystem
-Library JSONLibrary
-Resource environment/subscriptions.txt
-Library MockServerLibrary
-Library Process
-Suite Setup Create Sessions
-Suite Teardown Terminate All Processes kill=true
-
-*** Test Cases ***
-GET all Performance Subscriptions
- [Documentation] Test ID: 8.3.2.6.1
- ... Test title: GET all Performance Subscriptions
- ... Test objective: The objective is to test the retrieval of all performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available.
- ... Reference: clause 6.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Get all Performance Subscriptions
- Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is PmSubscriptions
-
-GET Performance Subscriptions with attribute-based filter
- [Documentation] Test ID: 8.3.2.6.2
- ... Test title: GET Performance Subscriptions with attribute-based filter
- ... Test objective: The objective is to test the retrieval of performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available.
- ... Reference: clause 6.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Get Performance Subscriptions with attribute-based filters
- Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is PmSubscriptions
-
-GET Performance Management Subscriptions with Paged Response
- [Documentation] Test ID: 8.3.2.6.3
- ... Test title: GET Performance Management Subscriptions with Paged Response
- ... Test objective: The objective is to query information about NFV-MANO Performance Subscriptions to get Paged Response.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available.
- ... Reference: clauseclause 6.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Get all Performance Subscriptions
- Check HTTP Response Status Code Is 200
- Check HTTP Response Header Contains Link
-
-GET Performance Subscriptions with invalid attribute-based filter
- [Documentation] Test ID: 8.3.2.6.4
- ... Test title: GET Performance Subscriptions with invalid attribute-based filter
- ... Test objective: The objective is to test that the retrieval of performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available.
- ... Reference: clause 6.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Get Performance Subscriptions with invalid attribute-based filters
- Check HTTP Response Status Code Is 400
- Check HTTP Response Body Json Schema Is ProblemDetails
-
-GET Performance Subscriptions - Bad Request Response too Big
- [Documentation] Test ID: 8.3.2.6.5
- ... Test title: GET Performance Subscriptions - Bad Request Response too Big
- ... Test objective: The objective is to test that the retrieval of NFV-MANO performance subscriptions fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available.
- ... Reference: clause 6.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability:
- ... Post-Conditions:
- Get all Performance Subscriptions
- Check HTTP Response Status Code Is 400
- Check HTTP Response Body Json Schema Is ProblemDetails
-
-GET Performance Subscriptions with invalid resource endpoint
- [Documentation] Test ID: 8.3.2.6.6
- ... Test title: GET Performance Subscriptions with invalid resource endpoint
- ... Test objective: The objective is to test that the retrieval of all performance subscriptions fails when using invalid resource endpoint.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available.
- ... Reference: clause 6.5.8.3.2 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Get Performance Subscriptions with invalid resource endpoint
- Check HTTP Response Status Code Is 404
-
-Create new Performance subscription
- [Documentation] Test ID: 8.3.2.6.7
- ... Test title: Create new Performance subscription
- ... Test objective: The objective is to test the creation of a new performance subscription and perform a JSON schema and content validation of the returned subscription data structure.
- ... Pre-conditions: An instance is instantiated.
- ... Reference: clause 6.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: The performance subscription is successfully set and it matches the issued subscription.
- Send Post Request for Performance Subscription
- Check HTTP Response Status Code Is 201
- Check HTTP Response Body Json Schema Is PmSubscription
- Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
- Check Postcondition Performance Subscription Is Set
-
-
-Create duplicated Performance subscription with NFV-MANO not creating duplicated subscriptions
- [Tags] no-duplicated-subs
- [Documentation] Test ID: 8.3.2.6.8
- ... Test title: Create duplicated Performance subscription with NFV-MANO not creating duplicated subscriptions
- ... Test objective: The objective is to test the attempt of a creation of a duplicated performance subscription and check that no new subscription is created by the NFV-MANO and a link to the original subscription is returned
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available in the NFV-MANO.
- ... Reference: clause 6.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: The NFV-MANO does not support the creation of duplicated subscriptions
- ... Post-Conditions: The existing performance subscription returned is available in the NFV-MANO
- Send Post Request for Duplicated Performance Subscription
- Check HTTP Response Status Code Is 303
- Check HTTP Response Body Is Empty
- Check HTTP Response Header Contains Location
- Check Postcondition Subscription Resource Returned in Location Header Is Available
-
-Create duplicated Performance subscription with NFV-MANO creating duplicated subscriptions
- [Tags] duplicated-subs
- [Documentation] Test ID: 8.3.2.6.9
- ... Test title: Create duplicated Performance subscription with NFV-MANO creating duplicated subscriptions
- ... Test objective: The objective is to test the creation of a duplicated performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure.
- ... Pre-conditions: An instance is instantiated. At least one performance subscription is available in the NFV-MANO.
- ... Reference: clause 6.5.8.3.1 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: The NFV-MANO supports the creation of duplicated subscriptions
- ... Post-Conditions: The duplicated performance subscription is successfully set and it matches the issued subscription
- Send Post Request for Duplicated Performance Subscription
- Check HTTP Response Status Code Is 201
- Check HTTP Response Body Json Schema Is PmSubscription
- Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
- Check Postcondition Performance Subscription Is Set
-
-PUT Performance Subscriptions - Method not implemented
- [Documentation] Test ID: 8.3.2.6.10
- ... Test title: PUT Performance Subscriptions - Method not implemented
- ... Test objective: The objective is to test that PUT method is not allowed to modify performance subscriptions
- ... Pre-conditions: none
- ... Reference: clause 6.5.8.3.3 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Put Request for Performance Subscriptions
- Check HTTP Response Status Code Is 405
-
-PATCH Performance Subscriptions - Method not implemented
- [Documentation] Test ID: 8.3.2.6.11
- ... Test title: PATCH Performance Subscriptions - Method not implemented
- ... Test objective: The objective is to test that PATCH method is not allowed to update performance subscriptions
- ... Pre-conditions: none
- ... Reference: clause 6.5.8.3.4 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Patch Request for Performance Subscriptions
- Check HTTP Response Status Code Is 405
-
-DELETE Performance Subscriptions - Method not implemented
- [Documentation] Test ID: 8.3.2.6.12
- ... Test title: DELETE Performance Subscriptions - Method not implemented
- ... Test objective: The objective is to test that DELETE method is not allowed to delete performance subscriptions
- ... Pre-conditions: none
- ... Reference: clause 6.5.8.3.5 - ETSI GS NFV-SOL 009 [7] v3.5.1
- ... Config ID: Config_prod_NFV-MANO
- ... Applicability: none
- ... Post-Conditions: none
- Send Delete Request for Performance Subscriptions
- Check HTTP Response Status Code Is 405
-
-*** Keywords ***
-
-Create Sessions
- Pass Execution If ${NFVMANO_CHECKS_NOTIF_ENDPOINT} == 0 MockServer not necessary to run
- Start Process java -jar ${MOCK_SERVER_JAR} -serverPort ${callback_port} alias=mockInstance
- Wait For Process handle=mockInstance timeout=5s on_timeout=continue
- Create Mock Session ${callback_uri}:${callback_port}
-
-Check Notification Endpoint
- &{notification_request}= Create Mock Request Matcher GET ${callback_endpoint}
- &{notification_response}= Create Mock Response headers="Content-Type: application/json" status_code=204
- Create Mock Expectation ${notification_request} ${notification_response}
- Wait Until Keyword Succeeds ${total_polling_time} ${polling_interval} Verify Mock Expectation ${notification_request}
- Clear Requests ${callback_endpoint}
-
-Check HTTP Response Body Subscription Identifier matches the requested Subscription
- Log Trying to check response ID
- Should Be Equal As Strings ${response['body']['id']} ${subscriptionId}
- Log Subscription identifier as expected
-
-Check HTTP Response Status Code Is
- [Arguments] ${expected_status}
- Should Be Equal As Strings ${response['status']} ${expected_status}
- Log Status code validated
-
-Check HTTP Response Header Contains Link
- ${linkURL}= Get Value From Json ${response['headers']} $..Link
- Should Not Be Empty ${linkURL}
-
-Check HTTP Response Body Json Schema Is
- [Arguments] ${input}
- Run Keyword If '${input}' == 'ProblemDetails' Should Contain ${response['headers']['Content-Type']} application/problem+json
- ... ELSE Should Contain ${response['headers']['Content-Type']} application/json
- ${schema} = Catenate SEPARATOR= ${input} .schema.json
- Validate Json ${schema} ${response['body']}
- Log Json Schema Validation OK
-
-Check HTTP Response Body Is Empty
- Should Be Empty ${response['body']}
- Log No json schema is provided. Validation OK
-
-Get all Performance Subscriptions
- Set headers {"Accept": "application/json"}
- Set headers {"Content-Type": "application/json"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
- Get Performance Subscriptions with attribute-based filters
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Get Performance Subscriptions with invalid attribute-based filters
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Get Performance Subscriptions with invalid resource endpoint
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Send Post Request for Performance Subscription
- Set headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- ${template}= Get File jsons/subscriptions.json
- ${body}= Format String ${template} callback_uri=${callback_uri} callback_endpoint=${callback_endpoint}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Run Keyword If ${NFVMANO_CHECKS_NOTIF_ENDPOINT} == 1
- ... Check Notification Endpoint
-
-Check HTTP Response Body PmSubscription Attributes Values Match the Issued Subscription
- Log Check Response matches subscription
- ${template}= Get File jsons/subscriptions.json
- ${body}= Format String ${template} callback_uri=${callback_uri} callback_endpoint=${callback_endpoint}
- ${subscription}= evaluate json.loads('''${body}''') json
- Should Be Equal As Strings ${response['body']['callbackUri']} ${subscription['callbackUri']}
-
-Check Postcondition Performance Subscription Is Set
- Log Check Postcondition subscription exist
- Set Headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
- ${output}= Output response
- Set Suite Variable ${response} ${output}
- Check HTTP Response Status Code Is 200
-
-Send Post Request for Duplicated Performance Subscription
- Set headers {"Content-Type": "${CONTENT_TYPE_JSON}"}
- Set headers {"Accept": "${ACCEPT_JSON}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- ${template}= Get File jsons/subscriptions.json
- ${body}= Format String ${template} callback_uri=${callback_uri} callback_endpoint=${callback_endpoint}
- POST ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions ${body} allow_redirects=false
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Check HTTP Response Header Contains
- [Arguments] ${CONTENT_TYPE}
- Should Contain ${response['headers']} ${CONTENT_TYPE}
- Log Header is present
-
-Check Postcondition Subscription Resource Returned in Location Header Is Available
- Log Going to check postcondition
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": "${AUTHORIZATION}"}
- GET ${response['headers']['Location']}
- Integer response status 200
- Log Received a 200 OK as expected
- ${contentType}= Output response headers Content-Type
- Should Contain ${contentType} application/json
- ${result}= Output response body
- Validate Json PmSubscription.schema.json ${result}
- Log Validated PmSubscription schema
-
-Send Put Request for Performance Subscriptions
- [Documentation] This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
- ... Not Allowed" response as defined in clause 4.3.5.4.
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- PUT ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Send Patch Request for Performance Subscriptions
- [Documentation] This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
- ... Not Allowed" response as defined in clause 4.3.5.4.
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- PATCH ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
-
-Send Delete Request for Performance Subscriptions
- [Documentation] This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
- ... Not Allowed" response as defined in clause 4.3.5.4.
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
- DELETE ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
- ${output}= Output response
- Set Suite Variable ${response} ${output}
\ No newline at end of file
diff --git a/SOL009/NFVMANOPerformanceManagement-API/environment/subscriptions.txt b/SOL009/NFVMANOPerformanceManagement-API/environment/subscriptions.txt
deleted file mode 100644
index 49e695b6ef244b4e2eb0e96d3ee83f3f3ecbac62..0000000000000000000000000000000000000000
--- a/SOL009/NFVMANOPerformanceManagement-API/environment/subscriptions.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-*** Variables ***
-${callbackUri} http://172.22.1.7:9091/nfvmanopm/subscriptions
-${filter_ok} callbackUri=${callbackUri}
-${filter_ko} erroneousFilter=erroneous
-${total_polling_time} 2 min
-${polling_interval} 10 sec
-${response} httpresponse
diff --git a/SOL009/NFVMANOPerformanceManagement-API/jsons/subscriptions.json b/SOL009/NFVMANOPerformanceManagement-API/jsons/subscriptions.json
deleted file mode 100644
index 3ca4fc25ae9b33163639f7041e3f50efe537c320..0000000000000000000000000000000000000000
--- a/SOL009/NFVMANOPerformanceManagement-API/jsons/subscriptions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{{
- "callbackUri": "{callback_uri}{callback_endpoint}",
- "filter": {{
- "notificationTypes": ["ThresholdCrossedNotification"]
- }}
-}}
\ No newline at end of file
diff --git a/SOL009/NFVMANOPerformanceManagement-API/schemas/PmSubscription.schema.json b/SOL009/NFVMANOPerformanceManagement-API/schemas/PmSubscription.schema.json
deleted file mode 100644
index 848628dcc1ad95cd5852a32b90cd59380e43b235..0000000000000000000000000000000000000000
--- a/SOL009/NFVMANOPerformanceManagement-API/schemas/PmSubscription.schema.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "description": "This type represents a subscription. \n",
- "type": "object",
- "properties": {
- "id": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- },
- "filter": {
- "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
- "type": "object",
- "properties": {
- "pmSubscriptionFilter": {
- "description": "This type represents subscription filter criteria to match NFV-MANO functional entities and their associated managed objects. \n",
- "type": "object",
- "properties": {
- "manoEntityId": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- },
- "manoServiceIds": {
- "description": "manoServiceIds\tIdentifierInManoEntity\t0..N\tIf present, match NFV-MANO services with an instance identifier listed in this attribute.\nThe attributes \"manoServiceIds\" and \"manoServiceNames\" are alternatives to reference to NFV-MANO services in a filter. They should not be used together in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
- "type": "string"
- }
- },
- "manoServiceNames": {
- "description": "If present, match NFV-MANO services with an NFV-MANO service name listed in this attribute.\nThe attributes \"manoServiceIds\" and \"manoServiceNames\" are alternatives to reference to NFV-MANO services in a filter. They should not be used together in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "manoServiceInterfaceIds": {
- "description": "If present, match NFV-MANO functional entity produced interfaces with an instance identifier listed in this attribute.\nThe attributes \"manoServiceInterfaceIds\" and \"manoServiceInterfaceNames\" are alternatives to reference to NFV-MANO functional entity produced interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
- "type": "string"
- }
- },
- "manoServiceInterfaceNames": {
- "description": "If present, match NFV-MANO functional entity produced interfaces with an instance Name listed in this attribute.\nThe attributes \"manoServiceInterfaceIds\" and \"manoServiceInterfaceNames\" are alternatives to reference to NFV-MANO functional entity produced interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "consumedManoInterfaceIds": {
- "description": "If present, match NFV-MANO functional entity consumed interfaces with an instance identifier listed in this attribute.\nThe attributes \"consumedManoInterfaceIds\" and \"consumedManoInterfaceNames\" are alternatives to reference to NFV-MANO functional entity consumed interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- }
- },
- "consumedManoInterfaceNames": {
- "description": "If present, match NFV-MANO functional entity consumed interfaces with an instance Name listed in this attribute.\nThe attributes \"consumedManoInterfaceIds\" and \"consumedManoInterfaceNames\" are alternatives to reference to NFV-MANO functional entity consumed interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- }
- }
- },
- "notificationTypes": {
- "description": "Match particular notification types. Permitted values:\n - ThresholdCrossedNotification\n - PerformanceInformationAvailableNotification\n\nThe permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
- "type": "string",
- "enum": [
- "ThresholdCrossedNotification",
- "PerformanceInformationAvailableNotification"
- ]
- }
- }
- },
- "callbackUri": {
- "description": "The URI of the endpoint to send the notification to.\n",
- "type": "object",
- "properties": {
- "links": {
- "description": "String formatted according to IETF RFC 3986.\n",
- "type": "string"
- },
- "self": {
- "description": "This type represents a link to a resource using an absolute URI.\n",
- "type": "object",
- "required": [
- "href"
- ],
- "properties": {
- "href": {
- "description": "String formatted according to IETF RFC 3986.\n",
- "type": "string"
- }
- }
- }
- },
- "required": [
- "links",
- "self"
- ]
- }
- },
- "required": [
- "id",
- "callbackUri"
- ]
- }
\ No newline at end of file
diff --git a/SOL009/NFVMANOPerformanceManagement-API/schemas/PmSubscriptions.schema.json b/SOL009/NFVMANOPerformanceManagement-API/schemas/PmSubscriptions.schema.json
deleted file mode 100644
index 50d8ef1dd9e2a5fa3803fb3d6b3ffd02f79e7905..0000000000000000000000000000000000000000
--- a/SOL009/NFVMANOPerformanceManagement-API/schemas/PmSubscriptions.schema.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-"type": "array",
- "items": {
- "description": "This type represents a subscription. \n",
- "type": "object",
- "properties": {
- "id": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- },
- "filter": {
- "description": "This type represents a filter that can be used to subscribe for notifications related to performance management events. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
- "type": "object",
- "properties": {
- "pmSubscriptionFilter": {
- "description": "This type represents subscription filter criteria to match NFV-MANO functional entities and their associated managed objects. \n",
- "type": "object",
- "properties": {
- "manoEntityId": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- },
- "manoServiceIds": {
- "description": "manoServiceIds\tIdentifierInManoEntity\t0..N\tIf present, match NFV-MANO services with an instance identifier listed in this attribute.\nThe attributes \"manoServiceIds\" and \"manoServiceNames\" are alternatives to reference to NFV-MANO services in a filter. They should not be used together in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
- "type": "string"
- }
- },
- "manoServiceNames": {
- "description": "If present, match NFV-MANO services with an NFV-MANO service name listed in this attribute.\nThe attributes \"manoServiceIds\" and \"manoServiceNames\" are alternatives to reference to NFV-MANO services in a filter. They should not be used together in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "manoServiceInterfaceIds": {
- "description": "If present, match NFV-MANO functional entity produced interfaces with an instance identifier listed in this attribute.\nThe attributes \"manoServiceInterfaceIds\" and \"manoServiceInterfaceNames\" are alternatives to reference to NFV-MANO functional entity produced interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
- "type": "string"
- }
- },
- "manoServiceInterfaceNames": {
- "description": "If present, match NFV-MANO functional entity produced interfaces with an instance Name listed in this attribute.\nThe attributes \"manoServiceInterfaceIds\" and \"manoServiceInterfaceNames\" are alternatives to reference to NFV-MANO functional entity produced interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "consumedManoInterfaceIds": {
- "description": "If present, match NFV-MANO functional entity consumed interfaces with an instance identifier listed in this attribute.\nThe attributes \"consumedManoInterfaceIds\" and \"consumedManoInterfaceNames\" are alternatives to reference to NFV-MANO functional entity consumed interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "description": "An identifier with the intention of being globally unique.\n",
- "type": "string"
- }
- },
- "consumedManoInterfaceNames": {
- "description": "If present, match NFV-MANO functional entity consumed interfaces with an instance Name listed in this attribute.\nThe attributes \"consumedManoInterfaceIds\" and \"consumedManoInterfaceNames\" are alternatives to reference to NFV-MANO functional entity consumed interfaces in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
- "type": "array",
- "items": {
- "type": "string"
- }
- }
- }
- },
- "notificationTypes": {
- "description": "Match particular notification types. Permitted values:\n - ThresholdCrossedNotification\n - PerformanceInformationAvailableNotification\n\nThe permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
- "type": "string",
- "enum": [
- "ThresholdCrossedNotification",
- "PerformanceInformationAvailableNotification"
- ]
- }
- }
- },
- "callbackUri": {
- "description": "The URI of the endpoint to send the notification to.\n",
- "type": "object",
- "properties": {
- "links": {
- "description": "String formatted according to IETF RFC 3986.\n",
- "type": "string"
- },
- "self": {
- "description": "This type represents a link to a resource using an absolute URI.\n",
- "type": "object",
- "required": [
- "href"
- ],
- "properties": {
- "href": {
- "description": "String formatted according to IETF RFC 3986.\n",
- "type": "string"
- }
- }
- }
- },
- "required": [
- "links",
- "self"
- ]
- }
- },
- "required": [
- "id",
- "callbackUri"
- ]
- }
-}
\ No newline at end of file
diff --git a/indexes/sol_009_index.csv b/indexes/sol_009_index.csv
index 14ea0c1c012bbdfe48cb56e958fca9e9edcd9fd8..56a70747ab03c67f0662b49a66178a83155ac1cd 100644
--- a/indexes/sol_009_index.csv
+++ b/indexes/sol_009_index.csv
@@ -20,8 +20,8 @@
8.3.2.3,Individual Report Endpoint, IndividualReport.robot
8.3.2.4,Thresholds Endpoint, Thresholds.robot
8.3.2.5,Individual Threshold Endpoint, IndividualThreshold.robot
-8.3.2.6,Subscriptions Endpoint, Subscriptions.robot
-8.3.2.7,Individual Subscription Endpoint, IndividualSubscription.robot
+8.3.2.6,Void,Void
+8.3.2.7,Void,Void
8.3.2.8,Notifications,Notifications.robot
8.3.2.9,API Version Endpoint, ApiVersion.robot
8.3.2.10,Notification Endpoint, NotificationEndpoint.robot