diff --git a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
index cb3e03d23f08bd202af7ffffdee29950ba048554..bffe0edcc67b7bc33787509cd6e09d668bd542a7 100644
--- a/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
+++ b/SOL003/VNFPerformanceManagement-API/Subscriptions.robot
@@ -14,64 +14,64 @@ Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
*** Test Cases ***
-GET Subscription
- Get VNF Performance Management Subscriptions
+GET all VNF Performance Subscriptions
+ Get all VNF Performance Subscriptions
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is PmSubscriptions
-GET VNF Performance Management Subscription with attribute-based filter
- Get VNF Performance Management Subscriptions with filters
+GET VNF Performance Subscription with attribute-based filter
+ Get VNF Performance Subscriptions with attribute-based filters
Check HTTP Response Status Code Is 200
Check HTTP Response Body Json Schema Is PmSubscriptions
Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filter
GET VNF Performance Management Subscription with invalid attribute-based filter
- Get VNF Performance Management Subscriptions with invalid filters
+ Get VNF Performance Subscriptions with invalid attribute-based filters
Check HTTP Response Status Code Is 400
Check HTTP Response Body Json Schema Is ProblemDetails
-GET VNF Performance Management Subscription with invalid resource endpoint
- Get VNF Performance Management Subscriptions with invalid resource endpoint
+GET VNF Performance Subscription with invalid resource endpoint
+ Get VNF Performance Subscriptions with invalid resource endpoint
Check HTTP Response Status Code Is 404
-Create new VNF Performance Management subscription
- Send Post Request for VNF Performance Management Subscription
+Create new VNF Performance subscription
+ Send Post Request for VNF Performance Subscription
Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is PmSubscription
Check HTTP Response Body Matches the Subscription
- Check Postcondition VNF Performance Management Subscription Is Set
+ Check Postcondition VNF Performance Subscription Is Set
-Create duplicated VNF Performance Management subscription with duplication handler
- Send Post Request for Duplicated VNF Performance Management Subscription
+Create duplicated VNF Performance subscription with duplication handler
+ Send Post Request for Duplicated VNF Performance Subscription
Check HTTP Response Status Code Is 303
- Check HTTP Response Body Json Schema Is Empty
+ Check HTTP Response Body Is Empty
Check HTTP Response Header Contains Location
-Create duplicated VNF Performance Management subscription without duplication handler
- Send Post Request for Duplicated VNF Performance Management Subscription
+Create duplicated VNF Performance subscription without duplication handler
+ Send Post Request for Duplicated VNF Performance Subscription
Check HTTP Response Status Code Is 201
Check HTTP Response Body Json Schema Is PmSubscription
Check HTTP Response Body Matches the Subscription
- Check Postcondition VNF Performance Management Subscription Is Set
+ Check Postcondition VNF Performance Subscription Is Set
-PUT VNF Performance Management Subscriptions - Method not implemented
- Send Put Request for VNF Performance Management Subscriptions
+PUT VNF Performance Subscriptions - Method not implemented
+ Send Put Request for VNF Performance Subscriptions
Check HTTP Response Status Code Is 405
-PATCH VNF Performance Management Subscriptions - Method not implemented
- Send Patch Request for VNF Performance Management Subscriptions
+PATCH VNF Performance Subscriptions - Method not implemented
+ Send Patch Request for VNF Performance Subscriptions
Check HTTP Response Status Code Is 405
-DELETE VNF Performance Management Subscriptions - Method not implemented
- Send Delete Request for VNF Performance Management Subscriptions
+DELETE VNF Performance Subscriptions - Method not implemented
+ Send Delete Request for VNF Performance Subscriptions
Check HTTP Response Status Code Is 405
diff --git a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index 27973a6d8b966d0b7e4a098bc1dc46a92b2a7d77..da972bba0e1e923a8d6222b226d8ba4d4189b8a9 100644
--- a/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -11,7 +11,7 @@ Library JSONSchemaLibrary schemas/
Library Process
*** Keywords ***
-Get VNF Performance Management Subscriptions
+Get all VNF Performance Subscriptions
[Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
... subscribed by the client.
... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
@@ -31,7 +31,7 @@ Get VNF Performance Management Subscriptions
# Log Validated PmSubscription schema
- Get VNF Performance Management Subscriptions with filters
+ Get VNF Performance Subscriptions with attribute-based filters
[Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
... subscribed by the client.
... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
@@ -51,7 +51,7 @@ Get VNF Performance Management Subscriptions
-Get VNF Performance Management Subscriptions with invalid filters
+Get VNF Performance Subscriptions with invalid attribute-based filters
[Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
... subscribed by the client.
... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
@@ -70,7 +70,7 @@ Get VNF Performance Management Subscriptions with invalid filters
# Log Validated ProblemDetails schema
-Get VNF Performance Management Subscriptions with invalid resource endpoint
+Get VNF Performance Subscriptions with invalid resource endpoint
[Documentation] The client can use this method to query the list of active subscriptions to Performance management notifications
... subscribed by the client.
... This method shall follow the provisions specified in the tables 6.4.7.3.2-1 and 6.4.7.3.2-2 for URI query parameters,
@@ -90,7 +90,7 @@ Get VNF Performance Management Subscriptions with invalid resource endpoint
-Send Post Request for VNF Performance Management Subscription
+Send Post Request for VNF Performance Subscription
[Documentation] The POST method creates a new subscription.
... This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
... request and response data structures, and response codes.
@@ -121,7 +121,7 @@ Send Post Request for VNF Performance Management Subscription
# Should Contain ${headers} Location
-Send Post Request for Duplicated VNF Performance Management Subscription
+Send Post Request for Duplicated VNF Performance Subscription
[Documentation] The POST method creates a new subscription.
... This method shall follow the provisions specified in the tables 6.4.7.3.1-1 and 6.4.7.3.1-2 for URI query parameters,
... request and response data structures, and response codes.
@@ -151,7 +151,7 @@ Send Post Request for Duplicated VNF Performance Management Subscription
-Send Put Request for VNF Performance Management Subscriptions
+Send Put Request for VNF Performance Subscriptions
[Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
... Not Allowed" response as defined in clause 4.3.5.4.
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
@@ -161,7 +161,7 @@ Send Put Request for VNF Performance Management Subscriptions
# Integer response status 405
# Log Received 405 Method not implemented as expected
-Send Patch Request for VNF Performance Management Subscriptions
+Send Patch Request for VNF Performance Subscriptions
[Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
... Not Allowed" response as defined in clause 4.3.5.4.
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
@@ -171,7 +171,7 @@ Send Patch Request for VNF Performance Management Subscriptions
# Integer response status 405
# Log Received 405 Method not implemented as expected
-Send Delete Request for VNF Performance Management Subscriptions
+Send Delete Request for VNF Performance Subscriptions
[Documentation] This method is not supported. When this method is requested on this resource, the VNFM shall return a "405 Method
... Not Allowed" response as defined in clause 4.3.5.4.
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization": ${AUTHORIZATION}"}
@@ -198,7 +198,7 @@ Check HTTP Response Body Json Schema Is
Log Json Schema Validation OK
-Check HTTP Response Body Json Schema Is Empty
+Check HTTP Response Body Is Empty
Should Be Empty ${response['body']}
Log No json schema is provided. Validation OK
@@ -216,7 +216,7 @@ Check HTTP Response Body Matches the Subscription
-Check Postcondition VNF Performance Management Subscription Is Set
+Check Postcondition VNF Performance Subscription Is Set
Log Check Postcondition subscription exist
Log Trying to get the subscription
Set Headers {"Accept": "${ACCEPT_JSON}"}