From 099b478eb7603e234b7992b01406f6ddd1f46be8 Mon Sep 17 00:00:00 2001
From: uihassan <najam.hassan@xflowresearch.com>
Date: Thu, 12 Mar 2020 16:46:14 +0500
Subject: [PATCH] bug_fixes review

---
 SOL002/VNFFaultManagement-API/Alarms.robot    | 53 -----------------
 .../EscalatePerceivedSeverityTask.robot       |  6 +-
 .../Subscriptions.robot                       | 54 -----------------
 .../IndividualVNFInstance.robot               |  4 +-
 .../Subscriptions.robot                       |  1 +
 .../FaultManagement-APIKeyword.robot          |  4 +-
 .../Subscriptions.robot                       | 56 +-----------------
 .../VNFIndicatorsKeywords.robot               |  2 +-
 .../IndividualVNFInstance.robot               |  8 +--
 .../Subscriptions.robot                       | 58 +------------------
 .../Grants.robot                              |  8 +--
 .../IndividualGrant.robot                     |  4 +-
 SOL005/NSFaultManagement-API/Alarms.robot     | 55 +-----------------
 .../NSFaultManagement-API/Subscriptions.robot | 54 +----------------
 .../IndividualNSInstance.robot                | 10 ++--
 .../NSInstances.robot                         | 26 ++++-----
 16 files changed, 44 insertions(+), 359 deletions(-)

diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index 93f2bbdb..2245d3b0 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -57,59 +57,6 @@ GET information about multiple alarms with invalid attribute-based filter
     GET Alarms Task with invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails   
-
-GET information about multiple alarms with "all_fields" attribute selector
-    [Documentation]    Test ID: 6.3.4.1.5
-    ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    GET Alarms Task with all_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
-    
-GET information about multiple alarms with exclude_default attribute selector
-    [Documentation]    Test ID: 6.3.4.1.6
-    ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    GET Alarms Task with exclude_default attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
-
-    
-GET information about multiple alarms with fields attribute selector
-    [Documentation]    Test ID: 6.3.4.1.7
-    ...    Test title: GET information about multiple alarms with fields attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    GET Alarms Task with fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
-     
-GET information about multiple alarms with "exclude_fields" attribute selector
-    [Documentation]    Test ID: 6.3.4.1.8
-    ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: 
-    ...    Post-Conditions: none
-    GET Alarms Task with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms  
     
 PUT Alarms - Method not implemented
     [Documentation]    Test ID: 6.3.4.1.9
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index ca73cef1..d25671ed 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -20,7 +20,7 @@ Escalate the perceived severity
 GET Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.2
     ...    Test title: GET Escalate the perceived severity - Method not implemented
-    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Test objective: The objective is to test that the escalate perceived severity method is not implemented
     ...    Pre-conditions: 
     ...    Reference: clause 7.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -32,7 +32,7 @@ GET Escalate the perceived severity - Method not implemented
 PUT Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.3
     ...    Test title: PUT Escalate the perceived severity - Method not implemented
-    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Test objective: The objective is to test that the escalate perceived severity method is not implemented
     ...    Pre-conditions: 
     ...    Reference: clause 7.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -44,7 +44,7 @@ PUT Escalate the perceived severity - Method not implemented
 PATCH Escalate the perceived severity - Method not implemented
     [Documentation]    Test ID: 6.3.4.3.4
     ...    Test title: PATCH Escalate the perceived severity - Method not implemented
-    ...    Test objective: The objective is to test that the method is not implemented
+    ...    Test objective: The objective is to test that the escalate perceived severity method is not implemented
     ...    Pre-conditions: 
     ...    Reference: clause 7.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index c9a96e52..b24fc27a 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -83,60 +83,6 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     Get subscriptions - invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails 
-
-GET subscriptions with "all_fields" attribute selector
-    [Documentation]    Test ID: 6.3.4.4.8
-    ...    Test title: GET subscriptions with "all_fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with all_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions 
-
-GET subscriptions with "exclude_default" attribute selector
-    [Documentation]    Test ID: 6.3.4.4.9
-    ...    Test title: GET subscriptions with "exclude_default" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with exclude_default attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions
-
-GET subscriptions with "fields" attribute selector
-    [Documentation]    Test ID: 6.3.4.4.10
-    ...    Test title: GET subscriptions with "fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions
-
-GET subscriptions with "exclude_fields" attribute selector
-    [Documentation]    Test ID: 6.3.4.4.11
-    ...    Test title: GET subscriptions with "exclude_fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions    
-
-
         
 PUT subscriptions - Method not implemented
     [Documentation]    Test ID: 6.3.4.4.8
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index b89e8e16..a632aa10 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -79,7 +79,7 @@ PATCH Individual VNFInstance Precondition failed
 PATCH Individual VNFInstance Conflict
     [Documentation]    Test ID: 6.3.5.2.6
     ...    Test title: PATCH Individual VNFInstance Conflict
-    ...    Test objective: The objective is to verify that The PATCH operation cannot be executed currently, due to a conflict with the state of the VNF instance resource because anyother LCM Operation is ongoing.
+    ...    Test objective: The objective is to verify that modification operation cannot be executed currently, due to a conflict with the state of the VNF instance resource because another LCM Operation is ongoing. 
     ...    Pre-conditions: none
     ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VE
@@ -104,7 +104,7 @@ DELETE Individual VNFInstance
 DELETE Individual VNFInstance Conflict
      [Documentation]    Test ID: 6.3.5.2.8
     ...    Test title: DELETE Individual VNFInstance Conflict
-    ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
     ...    Reference: clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.4.1
     ...    Config ID: Config_prod_VE
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index c5fe1272..a65cd4a6 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -19,6 +19,7 @@ POST Create a new subscription
     Post Create subscription
     Check HTTP Response Status Code Is    201
     Check HTTP Response Body Json Schema Is    Subscription
+    
 POST Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 6.3.5.17.2
     ...    Test title: POST Create a new subscription - DUPLICATION
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 05c29e0b..a82a0a9c 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -266,7 +266,7 @@ POST Subscription
     ${outputResponse}=    Output    response
     Set Global Variable    @{response}    ${outputResponse}
     
-POST Subscription Duplication permitted
+Send POST Request for duplicated subscription
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     Pass Execution If    ${VNFM_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -277,7 +277,7 @@ POST Subscription Duplication permitted
     ${outputResponse}=    Output    response
     Set Global Variable    @{response}    ${outputResponse}
 
-POST Subscription Duplication not permitted
+Send POST Request for duplicated subscription not permitted
     Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions
     Pass Execution If    ${VNFM_DUPLICATION} == 1    NVFO is not permitting duplication. Skipping the test
     Set Headers  {"Accept":"${ACCEPT}"}  
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 67b733ec..0ffe46fe 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -33,7 +33,7 @@ Create a new alarm subscription - DUPLICATION
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO allows creating a subscription resource if another subscription resource with the same filter and callbackUri already exists
     ...    Post-Conditions: duplicated subscription is created
-    POST Subscription Duplication permitted
+    Send POST Request for duplicated subscription
     Check HTTP Response Status Code Is    201
     Check Operation Occurrence Id
     Check HTTP Response Body Json Schema Is  FmSubscription
@@ -48,7 +48,7 @@ Create a new alarm subscription - NO DUPLICATION
     ...    Config ID:   Config_prod_VNFM
     ...    Applicability: the NFVO decides to not create a duplicate subscription resource 
     ...    Post-Conditions: duplicated subscription is not created
-    POST Subscription Duplication not permitted
+    Send POST Request for duplicated subscription not permitted
     Check HTTP Response Status Code Is    303
     Check Operation Occurrence Id
     Check Postcondition Subscription Resource Returned in Location Header Is Available
@@ -92,58 +92,6 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-GET subscriptions with "all_fields" attribute selector
-    [Documentation]    Test ID: 7.3.5.3.7
-    ...    Test title: GET subscriptions with "all_fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with all_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions 
-
-GET subscriptions with "exclude_default" attribute selector
-    [Documentation]    Test ID: 7.3.5.3.8
-    ...    Test title: GET subscriptions with "exclude_default" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with exclude_default attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions
-
-GET subscriptions with "fields" attribute selector
-    [Documentation]    Test ID: 7.3.5.3.9
-    ...    Test title: GET subscriptions with "fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions
-
-GET subscriptions with "exclude_fields" attribute selector
-    [Documentation]    Test ID: 7.3.5.3.10
-    ...    Test title: GET subscriptions with "exclude_fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 7.4.4.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions  
-    
 PUT subscriptions - Method not implemented
     [Documentation]    Test ID: 7.3.5.3.11
     ...    Test title:PUT subscriptions - Method not implemented
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index 6a5d23a1..f58c7a08 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -400,7 +400,7 @@ Send DELETE Request for indicators in VNF instance
 
 Check HTTP Response Body Includes Requested VNF Instances ID
     Log    Check Response includes Indicators according to resource identifier
-    Should Be Equal As Strings   ${response['body']['vnfInstanceId']}    ${vnfInstanceId}
+    Should Be Equal As Strings   ${response['body'][0]['vnfInstanceId']}    ${vnfInstanceId}
 
 Check Postcondition Indicators for VNF instance Exist
     Log    Check Postcondition Indicators for VNF instance Exist
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 8074476a..ad160761 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -66,8 +66,8 @@ PATCH Individual VNFInstance
 PATCH Individual VNFInstance Precondition failed
      [Documentation]    Test ID: 7.3.1.2.5
     ...    Test title: PATCH Individual VNFInstance Precondition failed
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Instance because pre-condition failed
-    ...    Pre-conditions:  VNF Instance is already created (Test ID 7.3.1.2.2)
+    ...    Test objective: The objective is to test the failure of modification of a vnf instance due to Etag Mismatch. The test also check the JSON schema of failed operation HTTP response. 
+    ...    Pre-conditions:  VNF Instance is already instantiated.
     ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
@@ -79,8 +79,8 @@ PATCH Individual VNFInstance Precondition failed
 PATCH Individual VNFInstance Conflict
      [Documentation]    Test ID: 7.3.1.2.6
     ...    Test title: PATCH Individual VNFInstance Conflict
-    ...    Test objective: The objective is to test the conflict while modifying a VNF instance resource
-    ...    Pre-conditions: another LCM operation is ongoing
+    ...    Test objective: The objective is to test the conflict while modifying a VNF instance resource because another LCM Operation is ongoing.
+    ...    Pre-conditions: Another LCM operation is ongoing
     ...    Reference: clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 9335de9f..15a50340 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -25,7 +25,7 @@ POST Create a new subscription
 Create a new Subscription - DUPLICATION
     [Documentation]    Test ID: 7.3.1.17.2
     ...    Test title: POST Create a new subscription - DUPLICATION
-    ...    Test objective: The objective is to test that POST method create a duplicate (same cakkbackurl and filter) subscription
+    ...    Test objective: The objective is to test request to create a duplicate (same cakkbackurl and filter) subscription
     ...    Pre-conditions: none
     ...    Reference: clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -38,7 +38,7 @@ Create a new Subscription - DUPLICATION
 Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 7.3.1.17.3
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
-    ...    Test objective: The objective is to test that POST method does not create a duplicate (same callbackurl and filter) subscription
+    ...    Test objective: The objective is to test the request that does not create a duplicate (same callbackurl and filter) subscription
     ...    Pre-conditions: none
     ...    Reference: clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -87,59 +87,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     Get subscriptions - invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
-
-GET subscriptions with all_fields attribute selector
-     [Documentation]    Test ID: 7.3.1.17.7
-    ...    Test title: GET subscriptions with all_fields attribute selector
-    ...    Test objective: The objective is Get the list of active subscriptions
-    ...    Pre-conditions: none
-    ...    Reference: clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get subscriptions with all_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    Subscriptions
-
-GET subscriptions with exclude_default attribute selector
-     [Documentation]    Test ID: 7.3.1.17.8
-    ...    Test title: GET subscriptions with exclude_default attribute selector
-    ...    Test objective: The objective is Get the list of active subscriptions
-    ...    Pre-conditions: none
-    ...    Reference: clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get subscriptions with exclude_default attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    Subscriptions
-
-GET subscriptions with fields attribute selector
-     [Documentation]    Test ID: 7.3.1.17.9
-    ...    Test title: GET subscriptions with fields attribute selector
-    ...    Test objective: The objective is Get the list of active subscriptions
-    ...    Pre-conditions: none
-    ...    Reference: clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get subscriptions with fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    Subscriptions
-
-GET subscriptions with exclude_fields attribute selector
-     [Documentation]    Test ID: 7.3.1.17.10
-    ...    Test title: GET subscriptions with exclude_fields attribute selector
-    ...    Test objective: The objective is Get the list of active subscriptions
-    ...    Pre-conditions: none
-    ...    Reference: clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
-    ...    Config ID: Config_prod_VNFM
-    ...    Applicability: none
-    ...    Post-Conditions: none 
-    Get subscriptions with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    Subscriptions
-
+    
 PUT subscriptions - Method not implemented
     [Documentation]    Test ID: 7.3.1.17.11
     ...    Test title: PUT subscriptions - Method not implemented
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index ee2b8c49..f96fcf2d 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -46,13 +46,13 @@ Requests a grant for a particular VNF lifecycle operation - Asynchronous mode
 Requests a grant for a particular VNF lifecycle operation - Forbidden 
     [Documentation]    Test ID: 7.3.2.1.3
     ...    Test title: Requests a grant for a particular VNF lifecycle operation - Forbidden 
-    ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation and check the content of the problem details data structure returned
+    ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation and the grant is rejected
     ...    Pre-conditions: none
-    ...    Reference: clause 9.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
+    ...    Reference: clause 9.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Send Request a new Grant Forbidden Operation
+    Send Request for a new Grant Forbiden Operation
     Check HTTP Response Status Code Is    403
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
@@ -130,7 +130,7 @@ Send Request Grant Request in Asynchronous mode
     ${body}=    Output    response
     Set Suite Variable    &{response}    ${body}
     
-Send Request a new Grant Forbidden Operation   
+Send Request for a new Grant Forbiden Operation   
     Log    Request a new Grant for a VNF LCM operation by POST to ${apiRoot}/${apiName}/${apiVersion}/grants
     Log    The grant request should be rejected
     Set Headers    {"Accept": "${ACCEPT}"}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index a2e1d55e..b56f6f78 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -47,7 +47,7 @@ GET an individual grant - Process ongoing
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
-    Get individual grant on-going
+    Get individual grant
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    grant
     
@@ -56,7 +56,7 @@ GET an individual grant - grant rejected
     [Documentation]    Test ID: 7.3.2.2.4
     ...    Test title: GET an individual grant - grant rejected
     ...    Test objective: The objective is to request a grant for a particular VNF lifecycle operation when grant is rejected
-    ...    Pre-conditions: 
+    ...    Pre-conditions: none
     ...    Reference: clause 9.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
diff --git a/SOL005/NSFaultManagement-API/Alarms.robot b/SOL005/NSFaultManagement-API/Alarms.robot
index a4f600f1..83003c20 100644
--- a/SOL005/NSFaultManagement-API/Alarms.robot
+++ b/SOL005/NSFaultManagement-API/Alarms.robot
@@ -57,60 +57,7 @@ GET information about multiple alarms Bad Request Invalid attribute-based filter
     GET Alarms With Invalid Filters
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
-
-GET information about multiple alarms with "all_fields" attribute selector
-    [Documentation]    Test ID: 5.3.3.1.5
-    ...    Test title: GET information about multiple alarms with "all_fields" attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    GET Alarms Task with all_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
-    
-GET information about multiple alarms with exclude_default attribute selector
-    [Documentation]    Test ID: 5.3.3.1.6
-    ...    Test title: GET information about multiple alarms with "exclude_default" attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    GET Alarms Task with exclude_default attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
-
-    
-GET information about multiple alarms with fields attribute selector
-    [Documentation]    Test ID: 5.3.3.1.7
-    ...    Test title: GET information about multiple alarms with fields attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: 
-    GET Alarms Task with fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms
-     
-GET information about multiple alarms with "exclude_fields" attribute selector
-    [Documentation]    Test ID: 5.3.3.1.8
-    ...    Test title: GET information about multiple alarms with "exclude_fields" attribute selector
-    ...    Test objective: The objective is to retrieve information about the alarm list
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability: 
-    ...    Post-Conditions: none
-    GET Alarms Task with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is    alarms  
-    
+  
 PUT Alarms - Method not implemented
     [Documentation]    Test ID: 5.3.3.1.5
     ...    Test title: PUT Alarms - Method not implemented
diff --git a/SOL005/NSFaultManagement-API/Subscriptions.robot b/SOL005/NSFaultManagement-API/Subscriptions.robot
index 80d37a1d..7dbfa215 100644
--- a/SOL005/NSFaultManagement-API/Subscriptions.robot
+++ b/SOL005/NSFaultManagement-API/Subscriptions.robot
@@ -88,59 +88,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     GET Subscriptions with Invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
-
-GET subscriptions with "all_fields" attribute selector
-    [Documentation]    Test ID: 5.3.3.3.7
-    ...    Test title: GET subscriptions with "all_fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with all_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions 
-
-GET subscriptions with "exclude_default" attribute selector
-    [Documentation]    Test ID: 5.3.3.3.8
-    ...    Test title: GET subscriptions with "exclude_default" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with exclude_default attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions
-
-GET subscriptions with "fields" attribute selector
-    [Documentation]    Test ID: 5.3.3.3.9
-    ...    Test title: GET subscriptions with "fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions
-
-GET subscriptions with "exclude_fields" attribute selector
-    [Documentation]    Test ID: 5.3.3.3.10
-    ...    Test title: GET subscriptions with "exclude_fields" attribute selector
-    ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
-    ...    Pre-conditions: 
-    ...    Reference: clause 8.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
-    ...    Config ID: Config_prod_NFVO
-    ...    Applicability:  
-    ...    Post-Conditions: 
-    Get subscriptions with exclude_fields attribute selector
-    Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   FmSubscriptions  
-    
+   
 PUT subscriptions - Method not implemented
     [Documentation]    Test ID: 5.3.3.3.11
     ...    Test title:PUT subscriptions - Method not implemented
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index db44553f..0461ed7a 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -16,7 +16,7 @@ POST Individual NSInstance - Method not implemented
     ...    Reference: clause 6.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not created on the NFVO
+    ...    Post-Conditions: Check Postcondition NS Instance is not created
     POST IndividualNSInstance
     Check HTTP Response Status Code Is    405
     Check Postcondition NS Instance is not crerated
@@ -42,7 +42,7 @@ PUT Individual NSInstance - Method not implemented
     ...    Reference: clause 6.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified on the NFVO
+    ...    Post-Conditions: Check Postcondition NS Instance is not modified
     PUT IndividualNSInstance
     Check HTTP Response Status Code Is    405
     Check Postcondition NS Instance is not modified
@@ -55,7 +55,7 @@ PATCH Individual NSInstance - Method not implemented
     ...    Reference: clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified on the NFVO
+    ...    Post-Conditions: Check Postcondition NS Instance is not modified
     PATCH IndividualNSInstance
     Check HTTP Response Status Code Is    405
     Check Postcondition NS Instance is not modified
@@ -68,7 +68,7 @@ DELETE Individual NSInstance
     ...    Reference: clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is deleted from the NFVO
+    ...    Post-Conditions: Check Postcondition NS Instance is deleted
     DELETE IndividualNSInstance    
     Check HTTP Response Status Code Is    204
     Check Postcondition NS Instance is deleted
@@ -81,7 +81,7 @@ DELETE Individual NSInstance Conflict
     ...    Reference: clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not deleted from the NFVO
+    ...    Post-Conditions: Check Postcondition NS Instance is not deleted
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 6f16103c..eb83646a 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -11,8 +11,8 @@ POST Create a new NsInstance
     [Documentation]    Test ID: 5.3.2.1.1
     ...    Test title: POST Create a new NsInstance
     ...    Test objective: The objective is to test the creation of a new Ns Instances and perform a JSON schema validation of the collected instance data structure
-    ...    Pre-conditions: None.
-    ...    Reference: clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Pre-conditions: An NS Instance is already created
+    ...    Reference: clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: A Ns instance is instantiated.
@@ -26,7 +26,7 @@ GET information about multiple NS instances
     ...    Test title: GET information about multiple NS instances
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: An NS Instance is already created
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -38,8 +38,8 @@ GET information about multiple NS instances Bad Request Invalid attribute-based
     [Documentation]    Test ID: 5.3.2.1.3
     ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to query information about multiple NS instances with Invalid attribute-based filtering parameters
-    ...    Pre-conditions: A Ns instance is instantiated, a bad attribute-based filter parameter is either malformed or syntactically incorrect (filter parameters are listed in Table 6.4.2.3.2-1  - SOL005 v2.4.1)
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Pre-conditions: An Ns instance is instantiated, a bad attribute-based filter parameter is either malformed or syntactically incorrect (filter parameters are listed in Table 6.4.2.3.2-1  - SOL005 v2.4.1)
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -52,7 +52,7 @@ GET information about multiple NS instances Bad Request Invalid attribute select
     ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute selector
  ...    Test objective: The objective is to query information about multiple NS instances with Invalid attribute selector
     ...    Pre-conditions: A Ns instance is instantiated, a bad attribute selector parameter is either malformed or syntactically incorrect (filter parameters are listed in Table 6.4.2.3.2-1  - SOL005 v2.4.1)
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -64,7 +64,7 @@ GET NSInstances with "all_fields" attribute selector
     ...    Test title: GET NSInstances with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -77,7 +77,7 @@ GET NSInstances with "exclude_default" attribute selector
     ...    Test title: GET NSInstances with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -90,7 +90,7 @@ GET NSInstances with "fields" attribute selector
     ...    Test title: GET NSInstances with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -103,7 +103,7 @@ GET NSInstances with "exclude_fields" attribute selector
     ...    Test title: GET NSInstances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -116,7 +116,7 @@ PUT NSInstances - Method not implemented
     ...    Test title: PUT Individual NS instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not modified by the operation
@@ -128,7 +128,7 @@ PATCH NSInstances - Method not implemented
     ...    Test title: PATCH NSInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not modified by the operation
@@ -140,7 +140,7 @@ DELETE NSInstances - Method not implemented
     ...    Test title: DELETE NSInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v2.4.1
+    ...    Reference: clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not deleted by the operation
-- 
GitLab