Merge branch 'Release3-onwards-New-TPs-Semantics' into Release3-onwards

LibOneM2M/OneM2M_Templates.ttcn

@@ -8281,6 +8281,36 @@ module OneM2M_Templates {
 			resultGenType := ?,
 			periodForResultGen := *
 		}
+
+		
+			/**
+		 * @desc Base primitiveContent for RETRIEVE operation for SemanticDescriptor resource
+		 */
+		template SemanticDescriptor_optional mw_retrieveSemanticDescriptor :=
+		{
+			resourceName := ?,
+			resourceType := int42,
+			resourceID := ?,
+			parentID := ?,
+			creationTime := ?,
+			lastModifiedTime := ?,
+			labels := *,
+			accessControlPolicyIDs := *,
+			expirationTime := ?,
+			dynamicAuthorizationConsultationIDs := *,
+			announceTo := *,
+			announcedAttribute := *,
+			creator := *,
+			descriptorRepresentation := ?,               
+			semanticOpExec := *,                         
+			descriptor := ?,       
+			ontologyRef := *,                            
+			relatedSemantics := *,                       
+			semanticValidated := *,                      
+			validationEnable := *,
+			choice := *                   
+		}
+
 			
 		/**
 		 * @desc Base primitiveContent for RETRIEVE operation for SemanticMashupJobProfile resource