Stf531 dmr

LibOneM2M/OneM2M_Templates.ttcn

@@ -552,14 +552,13 @@ module OneM2M_Templates {
 				}
 			};  
 			
-			//@ACV
 			/**
 			 * @desc Base Reception template for CREATE ContainerAnnc
 			 */
 			template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10003,
 				primitiveContent := {
-					any_1 := {{ContainerAnnc_optional := mw_contentCreateContainerAnncBase()}}	
+					any_1 := {{ContainerAnnc_optional := mw_contentCreateContainerAnncBase}}	
 				}
 			};
 			
@@ -615,14 +614,13 @@ module OneM2M_Templates {
 				}
 			};  
 			
-			//@ACV
 			/**
 			 * @desc Base Reception template for CREATE ContentInstanceAnnc
 			 */
 			template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10014,
 				primitiveContent := {
-					any_1 := {{ContentInstanceAnnc_optional := mw_contentCreateContentInstanceAnncBase()}}	
+					any_1 := {{ContentInstanceAnnc_optional := mw_contentCreateContentInstanceAnncBase}}	
 				}
 			};  
         	    		
@@ -662,14 +660,13 @@ module OneM2M_Templates {
 				}
 			};  
 			
-			//@ACV
 			/**
 			 * @desc Base Reception template for CREATE GroupAnnc
 			 */
 			template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10009,
 				primitiveContent := {
-					any_1 := {{GroupAnnc_optional := mw_contentCreateGroupAnncBase()}}	
+					any_1 := {{GroupAnnc_optional := mw_contentCreateGroupAnncBase}}	
 				}
 			};
         	
@@ -705,14 +702,13 @@ module OneM2M_Templates {
 				}
 			};  
 			
-			//@ACV
 			/**
 			 * @desc Base Reception template for CREATE MgmtObjAnnc
 			 */
 			template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10013,
 				primitiveContent := {
-					any_1 := {{MgmtObjAnnc_optional := mw_contentCreateMgmtObjAnncBase()}}	
+					any_1 := {{MgmtObjAnnc_optional := mw_contentCreateMgmtObjAnncBase}}	
 				}
 			};  
 			
@@ -800,18 +796,16 @@ module OneM2M_Templates {
 				}
 			};  
 			
-			//@ACV
 			/**
 			 * @desc Base Reception template for CREATE ScheduleAnnc
 			 */
 			template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10018,
 				primitiveContent := {
-					any_1 := {{ScheduleAnnc_optional := mw_contentCreateScheduleAnncBase()}}	
+					any_1 := {{ScheduleAnnc_optional := mw_contentCreateScheduleAnncBase}}	
 				}
 			};  
         	
-			//Added by @Naum
 			template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule" & f_rnd(1, 1000000),
@@ -878,19 +872,16 @@ module OneM2M_Templates {
 				}
 			}; 
 			
-			//@ACV
 			/**
 			 * @desc Base Reception template for CREATE LocationPolicyAnnc
 			 */
 			template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int10010,
 				primitiveContent := {
-					any_1 := {{LocationPolicyAnnc_optional := mw_contentCreateLocationPolicyAnncBase()}}	
+					any_1 := {{LocationPolicyAnnc_optional := mw_contentCreateLocationPolicyAnncBase}}	
 				}
 			}; 
 			
-			 
-        	//@Martin
         	template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
         	  requestIdentifier	:= testcasename() & "-m_createNotification" & f_rnd(1, 1000000),
         	  primitiveContent	:= {	
@@ -1254,11 +1245,10 @@ module OneM2M_Templates {
 			choice := omit//NP
     	};  
     	
-		  //@ACV
 		  /**
 		  * @desc Base reception template of primitiveContent for CREATE operation for GroupAnnc resource
 		  */
-		  template GroupAnnc_optional mw_contentCreateGroupAnncBase () := {
+		  template GroupAnnc_optional mw_contentCreateGroupAnncBase := {
 			  resourceName := omit,//NA M
 			  resourceType := omit,//NA M
 			  resourceID := omit,//NA M
@@ -1306,11 +1296,10 @@ module OneM2M_Templates {
 			description := omit//O
 		};	  	
 		
-		//@ACV
 		/**
 		 * @desc Base reception template of primitiveContent for CREATE operation for MgmtObjAnnc resource
 		 */
-		template MgmtObjAnnc_optional mw_contentCreateMgmtObjAnncBase () := {
+		template MgmtObjAnnc_optional mw_contentCreateMgmtObjAnncBase := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
@@ -1390,11 +1379,10 @@ module OneM2M_Templates {
 			choice := omit//NP
     	};  
     	
-		//@ACV
 		/**
 		 * @desc Base reception template of primitiveContent for CREATE operation for ScheduleAnnc resource
 		 */
-		template ScheduleAnnc_optional mw_contentCreateScheduleAnncBase () := {
+		template ScheduleAnnc_optional mw_contentCreateScheduleAnncBase := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
@@ -1531,12 +1519,11 @@ module OneM2M_Templates {
 			choice := omit //O
 		};
 		
-		//@ACV
 		/**
 		 * @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
 		 * @param p_primitiveContent Content for the ContentInstanceAnnc
 		 */
-		template ContentInstanceAnnc_optional mw_contentCreateContentInstanceAnncBase() := {
+		template ContentInstanceAnnc_optional mw_contentCreateContentInstanceAnncBase := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
@@ -1584,20 +1571,20 @@ module OneM2M_Templates {
 			choice := omit//NP
     	};
     	
-    	//@ACV
 		/**
 		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
 		*/
-		template ContainerAnnc_optional mw_contentCreateContainerAnncBase () := {
+		template ContainerAnnc_optional mw_contentCreateContainerAnncBase := {
 			resourceName := omit,//NA M
 			resourceType := omit,//NA M
 			resourceID := omit,//NA M
 			parentID := omit,//NA M
 			creationTime := omit,//NA M
 			lastModifiedTime := omit,//NA M
-			labels := ?,//MA
+			labels := ?,//MA M
 			accessControlPolicyIDs := ?,//MA
 			expirationTime := ?,//MA M
+			link := ?, //M
 			dynamicAuthorizationConsultationIDs := *, //OA
 			stateTag := *,	//OA
 			maxNrOfInstances := *,	//OA
@@ -1641,7 +1628,7 @@ module OneM2M_Templates {
 	  /**
 	  * @desc Base reception template of primitiveContent for CREATE operation for LocationPolicyAnnc resource
 	  */
-	  template LocationPolicyAnnc_optional mw_contentCreateLocationPolicyAnncBase() := {
+	  template LocationPolicyAnnc_optional mw_contentCreateLocationPolicyAnncBase := {
 		  resourceName := omit,//NA M
 		  resourceType := omit,//NA M
 		  resourceID := omit,//NA M