From aead3745a382b2b7cc366029b4aa5003bb19d93d Mon Sep 17 00:00:00 2001
From: bernini <g.bernini@nextworks.it>
Date: Tue, 26 May 2020 15:18:11 +0200
Subject: [PATCH] SOL003 VNF Indicator - Implementation of deltas between
 v2.6.1 and v2.4.1

---
 .../IndividualSubscription.robot              | 14 +++---
 .../IndividualVNFindicator.robot              | 12 ++---
 SOL003/VNFIndicator-API/Subscriptions.robot   | 46 ++++++++++++++----
 SOL003/VNFIndicator-API/VNFIndicators.robot   | 48 ++++++++++++++-----
 .../VNFIndicatorsKeywords.robot               |  4 ++
 .../VnfIndicatorNotification.robot            |  2 +-
 .../VnfIndicatorsInVnfInstanceId.robot        | 43 +++++++++++++----
 7 files changed, 125 insertions(+), 44 deletions(-)

diff --git a/SOL003/VNFIndicator-API/IndividualSubscription.robot b/SOL003/VNFIndicator-API/IndividualSubscription.robot
index 03251e04..02555cc4 100644
--- a/SOL003/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL003/VNFIndicator-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual VNF Indicator Subscription
     ...    Test title: GET Individual VNF Indicator Subscription
     ...    Test objective: The objective is to test the retrieval of individual VNF indicator subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: GET Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of individual VNF indicator subscription fails when using an invalid resource identifier.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ DELETE Individual VNF Indicator Subscription
     ...    Test title: DELETE Individual VNF Indicator Subscription
     ...    Test objective: The objective is to test the deletion of an individual VNF indicator subscription.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The subscription to VNF indicators is deleted
@@ -50,7 +50,7 @@ DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test title: DELETE Individual VNF Indicator Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF indicator subscription fails when using an invalid resource identifier.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -62,7 +62,7 @@ PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PUT Individual VNF Indicator Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an individual VNF indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -75,7 +75,7 @@ PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: PATCH Individual VNF Indicator Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an individual VNF indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -88,7 +88,7 @@ POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test title: POST Individual VNF Indicator Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF indicator subscription
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual VNF indicator subscription is not created by the operation
diff --git a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
index 9f06a85d..2851ca4a 100644
--- a/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL003/VNFIndicator-API/IndividualVNFindicator.robot
@@ -11,7 +11,7 @@ Get Individual Indicator for VNF Instance
     ...    Test title: Get Individual Indicator for VNF Instance
     ...    Test objective: The objective is to test the retrieval of an indicator for a given VNF instance and perform a JSON schema validation of the returned indicator data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM.
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test title: Get Individual Indicator for VNF Instance with invalid indicator identifier
     ...    Test objective: The objective is to test that the retrieval of an indicator for a given VNF instance fails when using an invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM.
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ POST Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: POST Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF indicator in the VNFM
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.4.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: PUT Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM
-    ...    Reference: clause 8.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.4.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: PATCH Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update an existing indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available for the given VNF instance.
-    ...    Reference: clause 8.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.4.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test title: DELETE Individual VNF Indicator for VNF Instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing indicator for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. At least one measure of VNF indicator is available in the VNFM
-    ...    Reference: clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The individual indicator for the VNF instance is not deleted by the unsuccessful operation
diff --git a/SOL003/VNFIndicator-API/Subscriptions.robot b/SOL003/VNFIndicator-API/Subscriptions.robot
index 56c2df54..ec280e8f 100644
--- a/SOL003/VNFIndicator-API/Subscriptions.robot
+++ b/SOL003/VNFIndicator-API/Subscriptions.robot
@@ -17,7 +17,7 @@ GET All VNF Indicator Subscriptions
     ...    Test title: GET All VNF Indicator Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF indicator subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -30,7 +30,7 @@ GET VNF Indicator Subscriptions with attribute-based filter
     ...    Test title: GET VNF Indicator Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicator 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 indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ GET VNF Indicator Subscriptions with invalid attribute-based filter
     ...    Test title: GET VNF Indicator Subscriptions with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicator 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 indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ GET VNF Indicator Subscriptions with invalid resource endpoint
     ...    Test title: GET VNF Indicator Subscriptions with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF indicator subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -69,7 +69,7 @@ Create new VNF indicator subscription
     ...    Test title: Create new VNF indicator subscription
     ...    Test objective: The objective is to test the creation of a new VNF indicator subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF indicator subscription is successfully set and it matches the issued subscription   
@@ -85,7 +85,7 @@ Create duplicated VNF indicator subscription with VNFM not creating duplicated s
     ...    Test title: Create duplicated VNF indicator subscription with VNFM not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF indicator subscription and check that no new subscription is created by the VNFM and a link to the original subscription is returned
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing VNF indicator subscription returned is available in the VNFM
@@ -101,7 +101,7 @@ Create duplicated VNF indicator subscription with VNFM creating duplicated subsc
     ...    Test title: Create duplicated VNF indicator subscription with VNFM creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated VNF indicator 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 indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated VNF indicator subscription is successfully set and it matches the issued subscription
@@ -116,7 +116,7 @@ PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PUT VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicator subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,10 +140,36 @@ DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test title: DELETE VNF Indicator Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators subscriptions
     ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
-    ...    Reference: clause 8.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF indicator subscriptions are not deleted by the failed operation   
     Send Delete Request for VNF Indicator Subscriptions
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Indicator Subscriptions Exists
+
+GET All VNF Indicator Subscriptions as Paged Response
+    [Documentation]    Test ID: 7.3.6.4.11
+    ...    Test title: GET All VNF Indicator Subscriptions as Paged Response
+    ...    Test objective: The objective is to test the retrieval of all VNF indicator subscriptions as Paged Response.
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none        
+    Get All VNF Indicators Subscriptions
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+    
+GET VNF Indicator Subscriptions - Bad Request Response too Big
+    [Documentation]    Test ID: 7.3.6.4.12
+    ...    Test title: GET VNF Indicator Subscriptions - Bad Request Response too Big
+    ...    Test objective: The objective is to test that the retrieval of VNF indicator subscriptions fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNFM.
+    ...    Reference: clause 8.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get All VNF Indicators Subscriptions
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails 
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/VNFIndicators.robot b/SOL003/VNFIndicator-API/VNFIndicators.robot
index cc6949cd..b77e5153 100644
--- a/SOL003/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicators.robot
@@ -12,7 +12,7 @@ Get all VNF Indicators
     ...    Test title: Get all VNF Indicators
     ...    Test objective: The objective is to test the retrieval of all the available VNF indicators and perform a JSON schema validation of the collected indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get VNF Indicators with attribute-based filter
     ...    Test title: Get VNF Indicators with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF indicators 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. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get VNF Indicators with invalid attribute-based filter
     ...    Test title: Get VNF Indicators with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF indicators 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. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ Get all VNF Indicators with malformed authorization token
     ...    Test title: Get all VNF Indicators with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using malformed authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ Get all VNF Indicators without authorization token
     ...    Test title: Get all VNF Indicators without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when omitting the authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET all VNF Indicators with expired or revoked authorization token
     ...    Test title: GET all VNF Indicators with expired or revoked authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using expired or revoked authorization token
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 4.5.3.3, 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNF requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ Get all VNF Indicators with invalid resource endpoint
     ...    Test title: Get all VNF Indicators with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF indicators fails when using invalid resource endpoint
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
-    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,7 +100,7 @@ POST all VNF Indicators - Method not implemented
     ...    Test title: POST all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM
-    ...    Reference: clause 8.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ PUT all VNF Indicators - Method not implemented
     ...    Test title: PUT all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM
-    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -124,7 +124,7 @@ PATCH all VNF Indicators - Method not implemented
     ...    Test title: PATCH all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNF
-    ...    Reference: clause 8.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,10 +136,36 @@ DELETE all VNF Indicators - Method not implemented
     ...    Test title: DELETE all VNF Indicators - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete VNF indicators
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNF
-    ...    Reference: clause 8.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.2.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF indicators are not deleted by the unsuccessful operation
     Send DELETE Request for all VNF indicators
     Check HTTP Response Status Code Is    405
     Check Postcondition VNF Indicators Exist
+    
+Get all VNF Indicators as Paged Response
+    [Documentation]    Test ID: 7.3.6.1.12
+    ...    Test title: Get all VNF Indicators as Paged Response
+    ...    Test objective: The objective is to test the retrieval of all the available VNF indicators as Paged Response.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get all VNF indicators
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+
+Get VNF Indicators - Bad Request Response too Big
+    [Documentation]    Test ID: 7.3.6.1.13
+    ...    Test title: Get VNF Indicators - Bad Request Response too Big
+    ...    Test objective: The objective is to test that the retrieval of VNF indicators fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
+    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM.
+    ...    Reference: clause 8.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get all VNF indicators
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index fbdd736c..50de8aaf 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -567,3 +567,7 @@ Check Notification Endpoint
     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 LINK in Header
+    ${linkURL}=    Get Value From Json    ${response.headers}    $..Link
+    Should Not Be Empty    ${linkURL}
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
index 412cf964..1aaad73f 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorNotification.robot
@@ -16,7 +16,7 @@ VNF Indicator Value Change Notification
     ...    Test title: VNF Indicator Value Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Indicator Value Change Notification when new indicator values are available in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF is instantiated, and a subscription for indicator value change notifications is available in the VNFM.
-    ...    Reference: clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.7.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 60f13fc9..50fb93bd 100644
--- a/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL003/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -6,14 +6,13 @@ Resource          VNFIndicatorsKeywords.robot
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 
-*** Test Cases ***
 *** Test Cases ***
 Get Indicators for VNF Instance
     [Documentation]    Test ID: 7.3.6.2.1
     ...    Test title: Get Indicators for VNF Instance
     ...    Test objective: The objective is to test the retrieval of all indicators for a given VNF instance and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +26,7 @@ GET Indicators for VNF Instance with attribute-based filter
     ...    Test title: GET Indicators for VNF Instance with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all indicators for a given VNF instance using attribute-based filter and perform a JSON schema validation of the returned indicators data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +40,7 @@ Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test title: Get Indicators for VNF Instance with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of all indicators for a given VNF instance fails using invalid attribute-based filter. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +53,7 @@ Get Indicators for VNF Instance with invalid resource identifier
     ...    Test title: Get Indicators for VNF Instance with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of all indicators for a given VNF instance fails when using invalid resource identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +66,7 @@ POST Indicators for VNF instance - Method not implemented
     ...    Test title: POST Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: clause 8.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -79,7 +78,7 @@ PUT Indicators for VNF instance - Method not implemented
     ...    Test title: PUT Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.3 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +90,7 @@ PATCH Indicators for VNF instance - Method not implemented
     ...    Test title: PATCH Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,10 +102,36 @@ DELETE Indicators for VNF instance - Method not implemented
     ...    Test title: DELETE Indicators for VNF instance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete indicators for a VNF instance
     ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
-    ...    Reference: clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 8.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.6.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The indicators for the VNF instance are not deleted by the unsuccessful operation
     Send DELETE Request for indicators in VNF instance
     Check HTTP Response Status Code Is    405
     Check Postcondition Indicators for VNF instance Exist
+
+Get Indicators for VNF Instance as Paged Response
+    [Documentation]    Test ID: 7.3.6.2.9
+    ...    Test title: Get Indicators for VNF Instance as Paged Response
+    ...    Test objective: The objective is to test the retrieval of all indicators for a given VNF instance as Paged Response.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get all indicators for a VNF instance
+    Check HTTP Response Status Code Is    200
+    Check LINK in Header
+    
+Get Indicators for VNF Instance - Bad Request Response too Big
+    [Documentation]    Test ID: 7.3.6.2.10
+    ...    Test title: Get Indicators for VNF Instance - Bad Request Response too Big
+    ...    Test objective: The objective is to test that the retrieval of all indicators for a given VNF instance fails because response is too big. The test also checks the JSON schema of the unsuccessful operation HTTP response.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more measures of VNF indicators are available in the VNFM for the given VNF instance.
+    ...    Reference: clause 8.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.6.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Get all indicators for a VNF instance
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
\ No newline at end of file
-- 
GitLab