From 06fa0b22f79b1ac1d3895a5bc43fe7b01cfcc644 Mon Sep 17 00:00:00 2001
From: Giacomo Bernini <g.bernini@nextworks.it>
Date: Fri, 19 Apr 2019 18:26:39 +0200
Subject: [PATCH] test doc to SOL002 and SOL003 VNF PM

---
 .../IndividualSubscription.robot              | 150 ++++----
 .../Subscriptions.robot                       | 296 +++++++--------
 .../VNFPerformanceManagementKeywords.robot    | 345 ++++++++++++++++++
 .../environment/individualSubscription.txt    |   4 +-
 .../environment/subscriptions.txt             |   8 +-
 .../IndividualSubscription.robot              |   4 +-
 .../Subscriptions.robot                       |   4 +-
 7 files changed, 576 insertions(+), 235 deletions(-)
 create mode 100644 SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

diff --git a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
index 5c9f4cd7..fbe9de14 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualSubscription.robot
@@ -1,79 +1,99 @@
 *** Settings ***
-Documentation     This resource represents subscriptions. The client can use this resource to subscribe to notifications related to VNF
-...               performance management and to query its subscriptions.
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 Library           OperatingSystem
 Library           JSONLibrary
 Resource          environment/individualSubscription.txt
+Resource          VNFPerformanceManagementKeywords.robot
 
 *** Test Cases ***
-GET Individual Subscription
-    [Documentation]    The client can use this method for reading an individual subscription about Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.8.3.2-1 and 6.4.8.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    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
+GET Individual VNF Performance Subscription
+    [Documentation]    Test ID: 7.3.4.7.1
+    ...    Test title: GET Individual VNF Performance Subscription
+    ...    Test objective: The objective is to test the retrieval of individual VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference:  section 6.4.8.3.2 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get Individual VNF 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 Subscription - Negative (Not Found)
-    [Documentation]    The client can use this method for reading an individual subscription about Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.8.3.2-1 and 6.4.8.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
-    Integer    response status    404
-    Log    Received a 404 Not found as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${result}
-    Log    Validated ProblemDetails schema
+GET Individual VNF Performance Subscription with invalid resource identifier
+    [Documentation]    Test ID: 7.3.4.7.2
+    ...    Test title: GET Individual VNF Performance Subscription with invalid resource identifier
+    ...    Test objective: The objective is to test that the retrieval of an individual VNF performance subscription fails when using an invalid resource identifier
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.8.3.2 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET individual VNF Performance Subscription with invalid resource identifier
+    Check HTTP Response Status Code Is    404
 
-POST Individual Subscription - (Method not implemented)
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}"}
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    Integer    response status    405
-    Log    Received 405 Method not implemented as expected
+DELETE Individual VNF Performance Subscription
+    [Documentation]    Test ID: 7.3.4.7.3
+    ...    Test title: DELETE Individual VNF Performance Subscription
+    ...    Test objective: The objective is to test the deletion of an individual VNF performance subscription
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.8.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance Subscription is not available anymore in the VNFM    
+    Send Delete request for individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    204
+    Check Postcondition VNF Performance Subscription is Deleted
 
-PUT Individual Subscription - (Method not implemented)
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions/${subscriptionId}
-    Integer    response status    405
-    Log    Received 405 Method not implemented as expected
+DELETE Individual VNF Performance Subscription with invalid resource identifier
+    [Documentation]    Test ID: 7.3.4.7.4
+    ...    Test title: DELETE Individual VNF Performance Subscription with invalid resource identifier
+    ...    Test objective: The objective is to test that the deletion of an individual VNF performance subscription fails when using an invalid resource identifier
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.8.3.5 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none   
+    Send Delete request for individual VNF Performance Subscription with invalid resource identifier
+    Check HTTP Response Status Code Is    404
 
-PATCH Individual Subscription - (Method not implemented)
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions/${subscriptionId}
-    Integer    response status    405
-    Log    Received 405 Method not implemented as expected
+POST Individual VNF Performance Subscription - Method not implemented
+    [Documentation]    Test ID: 7.3.4.7.5
+    ...    Test title: POST Individual VNF Performance Subscription - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Subscription
+    ...    Pre-conditions: A VNF instance is instantiated
+    ...    Reference: section 6.4.8.3.1 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance Subscription is not created on the VNFM
+    Send Post request for individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscription is not Created
 
-DELETE Individual Subscription - (Method not implemented)
-    [Documentation]    This method terminates an individual subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.8.3.5-1 and 6.4.8.3.5-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
-    Integer    response status    204
-    Log    Received a 204 No Content as expected
-    ${body}=    Output    response body
-    Should Be Empty    ${body}
-    Log    Body of the response is empty
+PUT Individual VNF Performance Subscription - Method not implemented
+    [Documentation]    Test ID: 7.3.4.7.6
+    ...    Test title: PUT Individual VNF Performance Subscription - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance subscription
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.8.3.3 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
+    Send Put request for individual VNF Performance Threshold
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
+
+PATCH Individual VNF Performance Subscription - Method not implemented
+    [Documentation]    Test ID: 7.3.4.7.7
+    ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.8.3.4 - SOL002 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF Performance subscription is not modified by the operation
+    Send Patch request for individual VNF Performance Threshold
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
index 10cba103..fe19aa75 100644
--- a/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL002/VNFPerformanceManagement-API/Subscriptions.robot
@@ -1,178 +1,150 @@
 *** Settings ***
-Documentation     This resource represents subscriptions. The client can use this resource to subscribe to notifications related to VNF
-...               performance management and to query its subscriptions.
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
 Library           OperatingSystem
 Library           JSONLibrary
+Resource          VNFPerformanceManagementKeywords.robot
 Resource          environment/subscriptions.txt
+Library           MockServerLibrary
+Library           Process
+Suite Setup       Create Sessions
+Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
-GET Subscription
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
-    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    PmSubscriptions.schema.json    ${result}
-    Log    Validated PmSubscription schema
+GET all VNF Performance Subscriptions
+    [Documentation]    Test ID: 6.3.3.6.1
+    ...    Test title: GET all VNF Performance Subscriptions
+    ...    Test objective: The objective is to test the retrieval of all VNF performance subscriptions and perform a JSON schema validation of the returned subscriptions data structure
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference:  section 6.4.7.3.2 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    Get all VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    PmSubscriptions
 
-GET Subscription - Filter
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
-    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    PmSubscriptions.schema.json    ${result}
-    Log    Validated PmSubscription schema
+GET VNF Performance Subscriptions with attribute-based filter
+    [Documentation]    Test ID: 6.3.3.6.2
+    ...    Test title: GET VNF Performance Subscriptions with attribute-based filter
+    ...    Test objective: The objective is to test the retrieval of VNF performance subscriptions using attribute-based filter, perform a JSON schema validation of the collected indicators data structure, and verify that the retrieved information matches the issued attribute-based filters 
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference:  section 6.4.7.3.2 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get VNF Performance Subscriptions with attribute-based filters
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    PmSubscriptions
+    Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter 
 
-GET Subscription - Negative Filter (Erroneous filter)
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
-    Integer    response status    400
-    Log    Received a 400 Bad Request as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${result}
-    Log    Validated ProblemDetails schema
+GET VNF Performance Management Subscriptions with invalid attribute-based filter
+    [Documentation]    Test ID: 6.3.3.6.3
+    ...    Test title: GET VNF Performance Management Subscriptions with invalid attribute-based filter
+    ...    Test objective: The objective is to test that the retrieval of VNF performance subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference:  section 6.4.7.3.2 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get VNF Performance Subscriptions with invalid attribute-based filters
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
 
-GET Subscription - Negative (Not Found)
-    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
-    ...    subscribed by the client.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
-    Integer    response status    404
-    Log    Received a 404 Not found as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Validate Json    ProblemDetails.schema.json    ${result}
-    Log    Validated ProblemDetails schema
+GET VNF Performance Subscriptions with invalid resource endpoint
+    [Documentation]    Test ID: 6.3.3.6.4
+    ...    Test title: GET VNF Performance Subscriptions with invalid resource endpoint
+    ...    Test objective: The objective is to test that the retrieval of all VNF performance subscriptions fails when using invalid resource endpoint.
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference:  section 6.4.7.3.2 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none    
+    Get VNF Performance Subscriptions with invalid resource endpoint
+    Check HTTP Response Status Code Is    404
+    
+Create new VNF Performance subscription
+    [Documentation]    Test ID 6.3.3.6.5
+    ...    Test title: Create new VNF Performance subscription
+    ...    Test objective: The objective is to test the creation of a new VNF performance subscription and perform a JSON schema and content validation of the returned subscription data structure
+    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Reference: section 6.4.7.3.1 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF performance subscription is successfully set and it matches the issued subscription    
+    Send Post Request for VNF Performance Subscription
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    PmSubscription
+    Check HTTP Response Body Matches the Subscription
+    Check Postcondition VNF Performance Subscription Is Set 
 
-POST Subscription
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the EM or VNF, and might make sense only in very rare use
-    ...    cases. Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with
-    ...    the same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may
-    ...    decide to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code
-    ...    referencing the existing subscription resource with the same filter and callbackUri).
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
-    Integer    response status    201
-    Log    Received a 201 Created 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
-    Log    Trying to validate the Location header
-    ${headers}=    Output    response headers
-    Should Contain    ${headers}    Location
 
-POST Subscription - DUPLICATION
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the EM or VNF, and might make sense only in very rare use
-    ...    cases. Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with
-    ...    the same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may
-    ...    decide to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code
-    ...    referencing the existing subscription resource with the same filter and callbackUri).
-    Pass Execution If    ${VNFM_DUPLICATION} == 1    VNFM is permitting duplication. Skipping the test
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
-    Integer    response status    303
-    Log    Received a 303 See other as expected
-    ${contentType}=    Output    response headers Content-Type
-    Should Contain    ${contentType}    application/json
-    ${result}=    Output    response body
-    Should Be Empty    ${result}
-    Log    Body is empty
-    Log    Trying to validate the Location header
-    ${headers}=    Output    response headers
-    Should Contain    ${headers}    Location
+Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
+    [Tags]    no-duplicated-subs
+    [Documentation]    Test ID 6.3.3.6.6
+    ...    Test title: Create new VNF Performance subscription
+    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and check that no new subscription is created
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.7.3.1 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
+    ...    Post-Conditions: The existing VNF performance subscription returned is set and it is valid 
+    Send Post Request for Duplicated VNF 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 URI Returned in Location Header Is Valid
 
-POST Subscription - NO DUPLICATION
-    [Documentation]    The POST method creates a new subscription.
-    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
-    ...    request and response data structures, and response codes.
-    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
-    ...    degradation and will provide duplicates of notifications to the EM or VNF, and might make sense only in very rare use
-    ...    cases. Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with
-    ...    the same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may
-    ...    decide to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code
-    ...    referencing the existing subscription resource with the same filter and callbackUri).
-    Pass Execution If    ${VNFM_DUPLICATION} == 0    VNFM is not permitting duplication. Skipping the test
-    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
-    Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
-    ${body_request}=    Get File    jsons/subscriptions.json
-    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
-    Integer    response status    201
-    Log    Received a 201 Created 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
-    Log    Trying to validate the Location header
-    ${headers}=    Output    response headers
-    Should Contain    ${headers}    Location
+Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
+    [Tags]    duplicated-subs
+    [Documentation]    Test ID 6.3.3.6.7
+    ...    Test title: Create new VNF Performance subscription
+    ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.7.3.1 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM supports the creation of duplicated subscriptions
+    ...    Post-Conditions: The duplicated VNF performance subscription is successfully set and it matches the issued subscription
+    Send Post Request for Duplicated VNF Performance Subscription
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    PmSubscription
+    Check HTTP Response Body Matches the Subscription
+    Check Postcondition VNF Performance Subscription Is Set 
 
-PUT Subscription - (Method not implemented)
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions
-    Integer    response status    405
-    Log    Received 405 Method not implemented as expected
-
-PATCH Subscription - (Method not implemented)
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions
-    Integer    response status    405
-    Log    Received 405 Method not implemented as expected
-
-DELETE Subscription - (Method not implemented)
-    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions
-    Integer    response status    405
-    Log    Received 405 Method not implemented as expected
+PUT VNF Performance Subscriptions - Method not implemented
+    [Documentation]    Test ID 6.3.3.6.8
+    ...    Test title: PUT VNF Performance Subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF performance subscriptions
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.7.3.3 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Put Request for VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    405 
+    
+PATCH VNF Performance Subscriptions - Method not implemented
+    [Documentation]    Test ID 6.3.3.6.9
+    ...    Test title: PATCH VNF Performance Subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF performance subscriptions
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.7.3.4 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch Request for VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    405
+    
+DELETE VNF Performance Subscriptions - Method not implemented
+    [Documentation]    Test ID 6.3.3.6.10
+    ...    Test title: DELETE VNF Performance Subscriptions - Method not implemented
+    ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF performance subscriptions
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
+    ...    Reference: section 6.4.7.3.5 - SOL003 v2.4.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: The VNF performance thresholds are not deleted by the failed operation   
+    Send Delete Request for VNF Performance Subscriptions
+    Check HTTP Response Status Code Is    405
+    Check Postcondition VNF Performance Subscriptions Exists
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
new file mode 100644
index 00000000..a7c7ade1
--- /dev/null
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -0,0 +1,345 @@
+*** Settings ***
+Resource    environment/variables.txt
+Resource    environment/subscriptions.txt
+Resource    environment/individualSubscription.txt
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
+Library    MockServerLibrary 
+Library    OperatingSystem
+Library    BuiltIn
+Library    JSONLibrary
+Library    Collections
+Library    JSONSchemaLibrary    schemas/
+Library    Process    
+
+*** Keywords ***
+Get all VNF Performance Subscriptions
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "application/json"}
+    Set headers    {"Content-Type": "application/json"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # 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    PmSubscriptions.schema.json    ${result}
+    # Log    Validated PmSubscription schema
+
+
+ Get VNF Performance Subscriptions with attribute-based filters
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # 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    PmSubscriptions.schema.json    ${result}
+    # Log    Validated PmSubscription schema    
+    
+
+
+Get VNF Performance Subscriptions with invalid attribute-based filters
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    400
+    # Log    Received a 400 Bad Request as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    ProblemDetails.schema.json    ${result}
+    # Log    Validated ProblemDetails schema
+    
+    
+Get VNF Performance Subscriptions with invalid resource endpoint
+    [Documentation]    The client can use this method to query the list of active subscriptions to Performance management notifications
+    ...    subscribed by the client.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    404
+    # Log    Received a 404 Not found as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Validate Json    ProblemDetails.schema.json    ${result}
+    # Log    Validated ProblemDetails schema    
+
+
+
+Send Post Request for VNF Performance Subscription
+    [Documentation]    The POST method creates a new subscription.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
+    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
+    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
+    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
+    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
+    ...    the existing subscription resource with the same filter and callbackUri).
+    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    ${body_request}=    Get File    jsons/subscriptions.json
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
+    ...       Check Notification Endpoint
+    # Integer    response status    201
+    # Log    Received a 201 Created 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
+    # Log    Trying to validate the Location header
+    # ${headers}=    Output    response headers
+    # Should Contain    ${headers}    Location
+
+
+Send Post Request for Duplicated VNF Performance Subscription
+    [Documentation]    The POST method creates a new subscription.
+    ...    This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
+    ...    request and response data structures, and response codes.
+    ...    Creation of two subscription resources with the same callbackURI and the same filter can result in performance
+    ...    degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases.
+    ...    Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the
+    ...    same filter and callbackUri already exists (in which case it shall return the "201 Created" response code), or may decide
+    ...    to not create a duplicate subscription resource (in which case it shall return a "303 See Other" response code referencing
+    ...    the existing subscription resource with the same filter and callbackUri).
+    Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    ${body_request}=    Get File    jsons/subscriptions.json
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body_request}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}    
+    # Integer    response status    303
+    # Log    Received a 303 See other as expected
+    # ${contentType}=    Output    response headers Content-Type
+    # Should Contain    ${contentType}    application/json
+    # ${result}=    Output    response body
+    # Should Be Empty    ${result}
+    # Log    Body is empty
+    # Log    Trying to validate the Location header
+    # ${headers}=    Output    response headers
+    # Should Contain    ${headers}    Location
+    
+
+
+Send Put Request for VNF Performance Subscriptions
+    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    405
+    # Log    Received 405 Method not implemented as expected
+
+Send Patch Request for VNF Performance Subscriptions
+    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    405
+    # Log    Received 405 Method not implemented as expected
+
+Send Delete Request for VNF Performance Subscriptions
+    [Documentation]    This method is not supported. When this method is requested on this resource, the VNFM 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}/${apiVersion}/subscriptions
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    # Integer    response status    405
+    # Log    Received 405 Method not implemented as expected
+
+Get Individual VNF Performance Subscription
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+GET individual VNF Performance Subscription with invalid resource identifier
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Delete request for individual VNF Performance Subscription
+    Set headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Delete request for individual VNF Performance Subscription with invalid resource identifier
+    Log    Trying to delete a subscription in the VNFM with invalid id
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    @{response}    ${output}
+
+Send Post request for individual VNF Performance Subscription
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    @{response}    ${output}
+
+Send Put request for individual VNF Performance Threshold
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    PUT    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    @{response}    ${output}
+    
+Send Patch request for individual VNF Performance Threshold
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    PATCH    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    @{response}    ${output}
+
+Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
+    Log    Check postconidtion subscription not modified
+    GET individual VNF Performance Subscription
+    Log    Check Response matches original VNF Threshold
+    ${subscription}=    evaluate    json.loads('''${response['body']}''')    json
+    Should Be Equal    ${origResponse['body']['id']}    ${subscription.id}
+    Should Be Equal    ${origResponse['body']['callbackUri']}    ${subscription.callbackUri}
+
+Check Postcondition VNF Performance Subscription is not Created
+    Log    Trying to get a new subscription
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${newSubscriptionId}
+    ${output}=    Output    response
+    Set Suite Variable    @{response}    ${output}
+    Check HTTP Response Status Code Is    404 
+
+Check Postcondition VNF Performance Subscription is Deleted
+    Log    Check Postcondition Subscription is deleted
+    GET individual VNF Performance Subscription
+    Check HTTP Response Status Code Is    404 
+
+Check HTTP Response Body Subscription Identifier matches the requested Subscription
+    Log    Trying to check response ID
+    Should Be Equal    ${response['body']['id']}    ${subscriptionId} 
+    Log    Subscription identifier as expected
+    
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response['status']}    ${expected_status}
+    Log    Status code validated 
+    
+    
+    
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    ${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  
+
+
+Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
+    Log    Check Response includes VNF Performance Management according to filter
+    # Should Be Equal As Strings    ${response['body']['callbackUri']}    ${callbackUri}
+    #TODO
+
+Check HTTP Response Body Matches the Subscription
+    Log    Check Response matches subscription
+    ${body}=    Get File    jsons/subscriptions.json
+    ${subscription}=    evaluate    json.loads('''${body}''')    json
+    Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
+
+Check Postcondition VNF Performance Subscription Is Set
+    Log    Check Postcondition subscription exist
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    Check HTTP Response Status Code Is    200
+
+Check Postcondition Subscription Resource URI Returned in Location Header Is Valid
+    Log    Going to check postcondition
+    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
+ 
+Check Postcondition VNF Performance Subscriptions Exists
+    Log    Checking that subscriptions exists
+    Get all VNF Performance Subscriptions         
+
+Check HTTP Response Header Contains
+    [Arguments]    ${CONTENT_TYPE}
+    Should Contain    ${response.headers}    ${CONTENT_TYPE}
+    Log    Header is present
+
+Check HTTP Response Location Header Resource URI
+    Log    Going to check
+    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
+
+Create Sessions
+    Pass Execution If    ${VNFM_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}
diff --git a/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt b/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
index 311bfbe3..921749ff 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/individualSubscription.txt
@@ -1,4 +1,6 @@
 *** Variables ***
 ${subscriptionId}    17563e75-0e14-4bd7-94b4-6bbb869c79aa
 ${erroneousSubscriptionId}    erroneousSubscriptionId
-${response}=    httpresponse
+${newSubscriptionId}    newSubsciptionId
+${response}    httpresponse
+${origResponse}    httpresponse
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt b/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
index 89a2b8bc..a450bb1b 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/subscriptions.txt
@@ -1,4 +1,8 @@
 *** Variables ***
-${filter_ok}      callbackUri=http://localhost/subscriptions
+${callbackUri}    http://172.22.1.7:9091/vnfpm/subscriptions
+${filter_ok}      callbackUri=${callbackUri}
 ${filter_ko}      erroneousFilter=erroneous
-${response}=    httpresponse
+${total_polling_time}   2 min
+${polling_interval}     10 sec
+${response}    httpresponse
+
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
index 887454e8..b01706e0 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualSubscription.robot
@@ -1,6 +1,4 @@
 *** Settings ***
-Documentation     This resource represents subscriptions. The client can use this resource to subscribe to notifications related to VNF
-...               performance management and to query its subscriptions.
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
@@ -88,7 +86,7 @@ PUT Individual VNF Performance Subscription - Method not implemented
     Check Postcondition VNF Performance Subscription is Unmodified (Implicit)
 
 PATCH Individual VNF Performance Subscription - Method not implemented
-    [Documentation]    Test ID: 7.3.4.7.6
+    [Documentation]    Test ID: 7.3.4.7.7
     ...    Test title: PATCH Individual VNF Performance Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Performance subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF performance subscription is available in the VNFM.
diff --git a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
index 0e61e72f..7ee9cf4f 100644
--- a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
@@ -1,6 +1,4 @@
 *** Settings ***
-Documentation     This resource represents subscriptions. The client can use this resource to subscribe to notifications related to VNF
-...               performance management and to query its subscriptions.
 Library           JSONSchemaLibrary    schemas/
 Resource          environment/variables.txt    # Generic Parameters
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
@@ -83,6 +81,7 @@ Create new VNF Performance subscription
 
 
 Create duplicated VNF Performance subscription with VNFM not creating duplicated subscriptions
+    [Tags]    no-duplicated-subs
     [Documentation]    Test ID 7.3.4.6.6
     ...    Test title: Create new VNF Performance subscription
     ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and check that no new subscription is created
@@ -98,6 +97,7 @@ Create duplicated VNF Performance subscription with VNFM not creating duplicated
     Check Postcondition Subscription Resource URI Returned in Location Header Is Valid
 
 Create duplicated VNF Performance subscription with VNFM creating duplicated subscriptions
+    [Tags]    duplicated-subs
     [Documentation]    Test ID 7.3.4.6.7
     ...    Test title: Create new VNF Performance subscription
     ...    Test objective: The objective is to test the creation of a duplicated VNF performance subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
-- 
GitLab