diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index b0e32dba8dca6537353c9e0733cf64a78335edd7..f08fced4392e9b0f8ac776998175d82dbb73b261 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -31,6 +31,7 @@ Get status information about Individual NS LCM occurrences
 	GET Individual NS LCM OP Occurrence
 	Check HTTP Response Status Code Is    200
 	Check HTTP Response Body Json Schema Is    NsLcmOpOcc
+	Check NsLcmOpOcc content against NS Descriptor
 	
 PUT status information about Individual NS LCM occurrences - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.3
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index 07adcda221085dad24b43d2c0fe3171d3d834beb..80b35b5496bc706c0ce8bda3a0365d9d1b9c9cad 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -559,8 +559,9 @@ GET Instantiate NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template}=    Get File    jsons/InstantiateNs.json
-    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}
+    ${body}=        Format String   ${template}     nsFlavourId=${nsFlavourId}   vimAccountId=${vimAccountId}   nsdId=${nsdId}    sapdId=${SAP_IDs[0]}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/instantiate    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
@@ -650,9 +651,10 @@ POST Update NSInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File 
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File  
     ${template} =    Get File    jsons/UpdateNsRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    
+    ${body}=        Format String   ${template}     vnfdId=${descriptor_id}    vnfFlavourId=${Flavour_ID}    newFlavourId=${Flavour_ID}    vnfVirtualLinkDescId=${VirtualLink_IDs[0]}    instantiationLevelId=${InstantiationLevel_IDs[1]}    vnfInstantiationLevelId=${InstantiationLevel_IDs[0]}    newNsdId=${NS_DescriptorID}    sapdId=${SAP_IDs[0]}    
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_instances/${nsInstanceId}/update    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
diff --git a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
index a76b3a89959b1a13df8a40dfd76b3af18d1ebe04..5944b173e7a58bd614b66aa390062de016f5a600 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationConsumer.robot
@@ -67,8 +67,9 @@ Post Ns Lcm Operation Occurrence Notification
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File
     ${template} =    Get File    jsons/NsLcmOperationOccurrenceNotification.json
-    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}  
+    ${body}=        Format String   ${template}    nsInstanceId=${nsInstanceId}    nsLcmOpOccId=${nsLcmOpOccId}    subscriptionId=${subscriptionId}    vnfdId=${Descriptor_ID}    nsdId=${NS_DescriptorID}  
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
index e19b6afbb67af87e6d82d9bb913064acacca9083..5d0c060fa55820dcc9c3eba73843c52b29f209e8 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/InstantiateNsRequest.json
@@ -1,6 +1,8 @@
-{
+{{
 	"nsFlavourId": "floavour_id",
-	"sapData":[],
+	"sapData":[
+		"{sapdId}"
+	],
 	"addpnfData":[],
 	"vnfInstanceData":[],
 	"nestedNsInstanceData":[],
@@ -8,4 +10,4 @@
 	"additionalParamsForNs":{},
 	"additionalParamForNestedNs":[],
 	"additionalParamsForVnf":[]
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
index 9a4e3cfb059e068a10e29cc44686ed0db5c9031a..706957a30261be69c7b903c8dde972510534ff29 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/NsLcmOperationOccurrenceNotification.json
@@ -12,5 +12,8 @@
 	"affectedVnf": {{
 		"vnfdId": "{vnfdId}"
 	}},
+	"affectedNs": {{
+		"nsdId": "{nsdId}"
+	}},
 	"_links":""
 }}
diff --git a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
index 756fa5756e5534024474dbb6b58003c73dd4fd3c..da42b41c16b748cb6b61ddf51055ed62fbb972c8 100644
--- a/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/UpdateNsRequest.json
@@ -6,10 +6,16 @@
 		"vnfInstantiationLevelId": "{vnfInstantiationLevelId}"
 		"extManagedVirtualLinks": {{
 			"vnfVirtualLinkDescId": "{vnfVirtualLinkDescId}"
-		}},
+	}},
 	"changeVnfFlavourData": {{
 		"vnfInstanceId": {},
 		"newFlavourId": "{newFlavourId}",
 		"instantiationLevelId": "{instantiationLevelId}"
-		}}
+	}},
+	"assocNewNsdVersionData": {{
+		"newNsdId": "{newNsdId}"
+	}}
+	"addSap": {{
+		"sapdId": "{sapdId}"
+	}}
 }}
\ No newline at end of file