Valueof missing and template element order fixed

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Templates.ttcn

@@ -1586,31 +1586,31 @@ module OneM2M_Templates {
 	
 	group ContentCreate {
 		
-		template (value) PrimitiveContent m_primitiveContentAe(template AE_optional p_ae) := {
+		template (value) PrimitiveContent m_primitiveContentAe(template (value) AE_optional p_ae) := {
 			aE := valueof(p_ae)
 		}
 		
-		template (value) PrimitiveContent m_primitiveContentContainer(template Container_optional p_container) := {
+		template (value) PrimitiveContent m_primitiveContentContainer(template (value) Container_optional p_container) := {
 			container := valueof(p_container)
 		}
 		
-		template (value) PrimitiveContent m_primitiveContentContentInstance(template ContentInstance_optional p_contentInstance) := {
+		template (value) PrimitiveContent m_primitiveContentContentInstance(template (value) ContentInstance_optional p_contentInstance) := {
 			contentInstance := valueof(p_contentInstance)
 		}
 		            
-        template (value) PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
+        template (value) PrimitiveContent m_primitiveContentCSEBase(template (value) CSEBase_optional p_cSEBase) := {
 	        cSEBase := valueof(p_cSEBase)
 		}
 
-		template (value) PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
+		template (value) PrimitiveContent m_primitiveContentRemoteCSE(template (value) RemoteCSE_optional p_remoteCSE) := {
 			remoteCSE := valueof(p_remoteCSE)
 		}
 		
-		template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template ResponsePrimitive p_responsePrimitive) := {
+		template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template (value) ResponsePrimitive p_responsePrimitive) := {
 			responsePrimitive := valueof(p_responsePrimitive)
 		}		
 		
-		template (value) PrimitiveContent m_primitiveContentGroup(template Group_optional p_group) := {
+		template (value) PrimitiveContent m_primitiveContentGroup(template (value) Group_optional p_group) := {
 			group_ := valueof(p_group)
 		}
 				
@@ -2243,8 +2243,8 @@ module OneM2M_Templates {
 			labels := ?,//M
 			accessControlPolicyIDs := ?,//M
 			expirationTime := ?,//M
-			dynamicAuthorizationConsultationIDs := *, //O
 			link := ?,//M
+			dynamicAuthorizationConsultationIDs := *, //O
 			nodeID := ?,//M
 			hostedCSELink := *,//O
 			mgmtClientAddress := *,//O
@@ -5558,9 +5558,9 @@ module OneM2M_Templates {
 				resultPersistence := omit,
 				resultContent := omit,
 				eventCategory := omit,
-				filterCriteria := omit,
 				deliveryAggregation := omit,
 				groupRequestIdentifier := omit,
+				filterCriteria := omit,
 				desiredIdentifierResultType := omit,
 				tokens := omit,
 				tokenIDs := omit,