- Creation of f_getLocalResourceAddress function (CseSimu)

- New Pixits for CSE1 parameters (name, resourceId, spId)
- Minor corrections to CSE/REG test cases
- Alignment of CSE/DMR/UPD test cases ids to the TS-0018 v1.0.0

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Functions.ttcn

@@ -2353,6 +2353,71 @@ module OneM2M_Functions {
 			}
 				
 		}
+		
+		/**
+		 * @desc Resolution of the resource address field (to) for a given resource depending on addressing and hierarchical format 
+		 * @param p_targetResourceIndex Internal resource index of the given resource
+		 * @return Resource address for the given resource
+		 * @verdict 
+		 */
+		function f_getLocalResourceAddress(integer  p_targetResourceIndex := -1, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
+			var XSD.ID v_resourceAddress;
+			
+			if(p_primitiveScope == e_cseRelative) {
+					
+				if(p_addressingMethod == e_nonHierarchical) {
+					if(p_targetResourceIndex == -1) {
+						return PX_CSE1_RESOURCE_ID;
+					} else {
+						return f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+					}
+				} else {
+					if(p_targetResourceIndex == -1) {
+						return PX_CSE1_NAME;
+					} else {
+						v_resourceAddress := f_getResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
+						return v_resourceAddress;
+					}	
+				}
+					
+			} else if (p_primitiveScope == e_spRelative) {
+				if(p_addressingMethod == e_nonHierarchical) {
+					if(p_targetResourceIndex == -1) {
+						return PX_CSE1_ID & "/" & PX_CSE1_RESOURCE_ID;
+					} else {
+						v_resourceAddress := PX_CSE_ID & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+						return v_resourceAddress;
+					}
+				} else {
+					if(p_targetResourceIndex == -1) {
+						return PX_CSE1_ID & "/" & PX_CSE1_NAME;
+					} else {
+						v_resourceAddress := f_getResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
+						return v_resourceAddress;
+					}
+				}
+			} else if (p_primitiveScope ==  e_absolute) {
+				if(p_addressingMethod == e_nonHierarchical) {
+					if(p_targetResourceIndex == -1) {
+						return PX_SP1_ID & PX_CSE1_ID;
+					} else {
+						v_resourceAddress := f_getResourceAddress(-, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource);
+						return v_resourceAddress;
+					}
+				} else {
+					if(p_targetResourceIndex == -1) {
+						return PX_SP1_ID & PX_CSE1_ID & "/" & PX_CSE1_NAME;
+					} else {
+						v_resourceAddress := f_getResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource);
+						return v_resourceAddress;
+					}	
+				}				
+			} else {
+				return "";
+			}
+				
+		}
+		
 		/**
 		 * @desc Saving of a resource and its parent index in the internal resource list
 		 * @param p_resource Resource to be saved

LibOneM2M/OneM2M_Pixits.ttcn

@@ -78,10 +78,26 @@ module OneM2M_Pixits {
 	
 			modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
 	
+
+			/**
+			 * @desc Test System CSE1 Name
+			 */	
+			modulepar XSD.ID PX_CSE1_NAME := "CSE1_NAME";
+		
 			/**
 			 * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
 			 */		
-			modulepar XSD.ID PX_CSE1_ID					:= "/MyCSEId";
+			modulepar XSD.ID PX_CSE1_ID := "/CSE1_ID";
+			
+			/**
+			 * @desc Test System CSE1 resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+			 */			
+			modulepar XSD.ID PX_CSE1_RESOURCE_ID	:= "CSE1_RESOURCE_ID";
+			 
+			/**
+			 * @desc Test System M2M-SP1-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
+			 */
+			modulepar XSD.ID PX_SP1_ID := "//onem2m.org";
 		
 			/**
 			 * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1