Descriptor checks added in 7.3.1.12.2

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

@@ -1342,21 +1342,18 @@ Check HTTP Response Body of Individual VNF LCM Operation occurrences content aga
     Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
     
 Check Individual VNF LCM Operation Occurence Content
-    Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF LCM    ELSE    Parse SOL006 VNF LCM
+    PARSE the Descriptor File
+    Match the VNF LCM Operation Occurence Response Attributes with Descriptors
     
-Parse SOL001 Individual VNF LCM
-    Get key for VNF Descriptor
+Match the VNF LCM Operation Occurence Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['AffectedVnfc']['vduId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages']['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks']['vnfVirtualLinkDescId']}
     
-    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_id}
-    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${vnfKey}.properties.descriptor_version}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
     
-Parse SOL006 Individual VNF LCM
-    ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
-    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${descriptor_id}
-    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${descriptor_version}
          
 Add VNF Descriptor Content to VNF Instance
     Run Keyword If  '${descriptorType}'=='SOL001'  Parse SOL001 VNF Instance    ELSE    Parse SOL006 VNF Instance