Fix #69

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

LibOneM2M/OneM2M_Templates.ttcn

@@ -830,7 +830,7 @@ module OneM2M_Templates {
 			/**
 			 * @desc Reception template for AE registration
 			 */
-			template  RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := ?) modifies mw_create := {
+			template  RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := mw_contentCreateAeBase) modifies mw_create := {
 				resourceType := int2,
 				primitiveContent := {aE := p_ae}
 			};  
@@ -1759,7 +1759,7 @@ module OneM2M_Templates {
     	 * @param p_name Resource name
     	 * @param p_accessControlPolicyIds ACP IDs for the AE
     	 */
-    	template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit)  XSD.String p_name := c_defaultAeResourceName, in template (omit) XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
+    	template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit)  XSD.String p_name := c_defaultAeResourceName, in template XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
 
 			resourceName := p_name,//O
 			resourceType := omit,//NP
@@ -1785,6 +1785,36 @@ module OneM2M_Templates {
 			supportedReleaseVersions := {"2a"}, //M
     		choice := omit//NP
     	};	
+
+    	/**
+    	 * @desc Base reception template of primitiveContent for CREATE operation for AE resource
+    	 */
+    	template AE_optional mw_contentCreateAeBase := {
+
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+    		dynamicAuthorizationConsultationIDs := *, //O
+    		announceTo := *,//O
+    		announcedAttribute := *,//O
+    		appName := *,//O
+			app_ID := ?,//M
+    		aE_ID := omit,//NP
+    		pointOfAccess := *, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
+    		ontologyRef := *,//O
+    		nodeLink := *,//NP
+    		requestReachability := ?,//M
+    		contentSerialization := *,//O
+			e2eSecInfo := *, //O
+			supportedReleaseVersions := ?, //M
+    		choice := *//NP
+    	};	
     	
     	/**
     	 * @desc Base primitiveContent for CREATE operation for AccessControlPolicy resource

OneM2M_Testcases_AE_Release_1.ttcn

@@ -465,7 +465,7 @@ module OneM2M_Testcases_AE_Release_1 {
 
 					//primitives for mcaPortIn
 					var MsgIn v_request;
-					var template RequestPrimitive v_requestPrimitive := mw_createAe;
+					var template RequestPrimitive v_requestPrimitive := mw_createAe("", -, -);
 					var ResponsePrimitive v_responsePrimitive;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";