SOL002/VNFLifecycleManagement-API/jsons/operateVnfRequest.json

 {{
+  "vnfcInstanceId": [],
   "changeStateTo": "{changeStateTo}",
   "stopType": "FORCEFUL",
+  "gracefulStopTimeout": "",
   "additionalParams": {}
 }}
\ No newline at end of file

SOL002/VNFLifecycleManagement-API/jsons/terminateVnfRequest.json

 {{
   "terminationType": "{terminationType}",
-  "additionalParams": {}
+  "gracefulTerminationTimeout": ""
 }}
\ No newline at end of file

SOL002/VNFPerformanceManagement-API/ApiVersion.robot

@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 

SOL002/VNFPerformanceManagement-API/IndividualReport.robot

@@ -10,7 +10,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none

SOL002/VNFPerformanceManagement-API/NotificationConsumer.robot

@@ -13,7 +13,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 

SOL002/VNFPerformanceManagement-API/environment/variables.txt

@@ -9,6 +9,7 @@ ${apiName}        vnfpm
 
 
 ${CONTENT_TYPE_JSON}    application/json
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}    application/json
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${FIELD_USAGE}    1
@@ -18,6 +19,8 @@ ${AUTH_USAGE}    1
 ${VNFM_DUPLICATION}    1
 ${VNFM_CHECKS_NOTIF_ENDPOINT}    1
 ${callback_uri}    http://localhost
+${unreachable_callback_uri}    http://not-reachable-uri
+${new_callback_uri}    http://newcallbackuri-for-PMJobModifications
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404

SOL002/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json

 {{
+	"objectType": "",
 	"objectInstanceIds" : "{objectInstanceIds}",
 	"criteria" : {{
 		"performanceMetric": "cpu_util",