diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 70e9373b0b3562eae00a01b9d6eb6a063d19fe3c..291d7bebd1a4afd8fb26b9054841e184ce16361d 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -63,7 +63,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 performance indicator subscription
... Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
- ... Reference: section 8.4.5.3.3 - SOL002 v2.4.1
+ ... Reference: section 8.4.6.3.3 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: The VNF supports the generation and maintenance of performance indicators.
... Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -76,7 +76,7 @@ PATCH 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 PATCH method is not allowed to update an individual VNF performance indicator subscription
... Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
- ... Reference: section 8.4.5.3.4 - SOL002 v2.4.1
+ ... Reference: section 8.4.6.3.4 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: The VNF supports the generation and maintenance of performance indicators.
... Post-Conditions: The individual VNF indicator subscription is not modified by the operation
@@ -89,7 +89,7 @@ POST 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 performance indicator subscription
... Pre-conditions: A VNF instance is instantiated. At least one VNF indicator subscription is available in the VNF.
- ... Reference: section 8.4.5.3.1 - SOL002 v2.4.1
+ ... Reference: section 8.4.6.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VE
... Applicability: The VNF supports the generation and maintenance of performance indicators.
... Post-Conditions: The individual VNF indicator subscription is not created by the operation
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index 58905d430057969c6b62180911d3879e81049e89..9ab9dec9fae81251a352563e532aa4ed3505d49e 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -18,7 +18,7 @@ GET individual VNF Performance Job
GET individual VNF Performance Job
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is PmJob
- Check HTTP Response Body Pm Job Identifier
+ Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
GET individual VNF Performance Job with invalid resource identifier
[Documentation] Test ID: 6.3.3.2.2
@@ -90,7 +90,7 @@ PATCH Individual VNF Performance Job - Method not implemented
... Test title: PATCH Individual VNF Performance Job - method not implemented
... Test objective: The objective is to test that PATCH method is not allowed to modify an existing new VNF Performance Monitoring Job
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
- ... Reference: section 6.4.3.3.5 - SOL002 v2.4.1
+ ... Reference: section 6.4.3.3.4 - SOL002 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: The VNF Performance Job is not modified by the operation
@@ -181,7 +181,7 @@ Check Postcondition VNF Pm Job is Deleted
GET individual VNF Performance Job
Check HTTP Response Status Code Is 404
-Check HTTP Response Body Pm Job Identifier
+Check HTTP Response Body Pm Job Identifier matches the requested Pm Job
Log Going to validate Pm Job info retrieved
Should Be Equal ${response[0]['body']['id']} ${pmJobId}
Log Pm Job identifier as expected
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 12a2eaf78a1974917cc990341c8a7704d45480c7..ee9964a8f339bf43f4f319335df7ad109ae261c2 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -40,7 +40,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
... Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
... Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
- ... Reference: section 6.4.2.3.2 - SOL002 v2.4.1
+ ... Reference: section 4.3.3.2.1, 6.4.2.3.2 - SOL002 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
@@ -54,7 +54,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
... Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
... Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
- ... Reference: section 6.4.2.3.2 - SOL002 v2.4.1
+ ... Reference: section 4.3.3.2.1, 6.4.2.3.2 - SOL002 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: none
... Post-Conditions: none
@@ -68,7 +68,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
... Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
... Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
- ... Reference: section 6.4.2.3.2 - SOL002 v2.4.1
+ ... Reference: section 4.3.3.2.1, 6.4.2.3.2 - SOL002 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: The VNFM supports the use of exclude_fields attribute selector
... Post-Conditions: none
@@ -82,7 +82,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
... Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
... Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
- ... Reference: section 6.4.2.3.2 - SOL002 v2.4.1
+ ... Reference: section 4.3.3.2.1, 6.4.2.3.2 - SOL002 v2.4.1
... Config ID: Config_prod_VNFM
... Applicability: The VNFM supports the use of exclude_fields attribute selector
... Post-Conditions: none
@@ -106,7 +106,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
GET VNF Performance Monitoring Jobs with invalid resource endpoint
[Documentation] Test ID: 6.3.3.1.8
- ... Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
+ ... Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
... Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
... Reference: section 6.4.2.3.2 - SOL002 v2.4.1
@@ -119,8 +119,8 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
Create new VNF Performance Monitoring Job
[Documentation] Test ID: 6.3.3.1.9
- ... Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
- ... Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
+ ... Test title: Create a new VNF Performance Monitoring Job
+ ... Test objective: The objective is to test the creation of a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
... Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
... Reference: section 6.4.2.3.1 - SOL002 v2.4.1
... Config ID: Config_prod_VNFM