Adaptation to xsd_1_6_0

OneM2M_Functions.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 23 2016-03-17 10:02:44Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 43 2016-04-13 12:16:12Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -52,7 +52,7 @@ module OneM2M_Functions {
 			var XSD.ID v_acpId;
 		
 		
-			v_acpId := f_createAccessControlPolicyAux("MyAcp", p_allowedOperations);
+			v_acpId := f_createAccessControlPolicyAux(p_allowedOperations);
 			
 			mcaPort.send(m_request(m_createAeAux(p_name, {v_acpId})));
 			tc_ac.start;
@@ -60,8 +60,8 @@ module OneM2M_Functions {
 				[] mcaPort.receive(mw_responseOK) -> value v_response {
 					tc_ac.stop;
 					log("Preamble: Application registered successfuly");
-					if(ischosen(v_response.responsePrimitive_.content.any_1[0].AE)) {
-						vc_ae := v_response.responsePrimitive_.content.any_1[0].AE;
+					if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE)) {
+						vc_ae := v_response.responsePrimitive_.primitiveContent.any_1[0].AE;
 					}
 				}
 				[] mcaPort.receive(mw_responseKO) {
@@ -157,19 +157,19 @@ module OneM2M_Functions {
 	
 	group getSetFunctions {
 
-		function f_getCreateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_name, in template (omit) AccessControlOperations p_allowedOperations, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
+		function f_getCreateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_aeResourceAddress, in template (omit) AccessControlOperations p_allowedOperations, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
 		
 			p_request.to_ := p_aeResourceAddress;
-			p_request.name := p_name;
+			//p_request.name := p_name;
 		
 			if (p_resourceType == int1) {//AccessControlPolicy
 			
 				if(isvalue(p_allowedOperations)){
-					p_request.content.any_1[0].ACP_create := valueof(m_contentCreateAcp (p_allowedOperations));
+					p_request.primitiveContent.any_1[0].ACP_create := valueof(m_contentCreateAcp (c_defaultResourceName, p_allowedOperations));
 				}		
 			} 
 			if (p_resourceType == int9) {//group
-				p_request.content.any_1[0].Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & vc_ae.resourceID}, omit);
+				p_request.primitiveContent.any_1[0].Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & vc_ae.resourceID}, omit);
 			}
 		
 			if (p_resourceType == int15) {//pollingChannel
@@ -179,10 +179,10 @@ module OneM2M_Functions {
 			return valueof(p_request);
 		}
 	
-		function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_resourceAddress, in template (omit) XSD.String p_name, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
+		function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_resourceAddress, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
 		
 			p_request.to_ := p_resourceAddress;
-			p_request.name := p_name;
+			//p_request.name := p_name;
 		
 			if (p_resourceType == int3) {//Container
 			
@@ -223,12 +223,12 @@ module OneM2M_Functions {
 	
 	group helpingFunctions {
 
-		function f_createResource(in ResourceType p_resourceType, XSD.ID p_parentResourceAddress, XSD.String p_resourceName, template RequestPrimitive p_requestPrimitive) runs on M2M {
+		function f_createResource(in ResourceType p_resourceType, XSD.ID p_parentResourceAddress, template RequestPrimitive p_requestPrimitive) runs on M2M {
 		
 			var M2MResponsePrimitive v_response;
 			var RequestPrimitive v_request;
 			
-			v_request := f_getCreateRequestPrimitive(p_resourceType,p_parentResourceAddress,p_resourceName, omit, p_requestPrimitive);
+			v_request := f_getCreateRequestPrimitive(p_resourceType,p_parentResourceAddress, omit, p_requestPrimitive);
 		
 			mcaPort.send(m_request(v_request));
 			tc_ac.start;
@@ -252,19 +252,19 @@ module OneM2M_Functions {
 	
 		}
 	
-		function f_createAccessControlPolicyAux(XSD.String p_resourceName, in template (value) AccessControlOperations p_allowedOperations) runs on M2M return XSD.ID{
+		function f_createAccessControlPolicyAux(in template (value) AccessControlOperations p_allowedOperations) runs on M2M return XSD.ID{
 		
 				var M2MResponsePrimitive v_response;
 				var XSD.ID v_acpId;
 			
-				mcaPort.send(m_request(m_createAcpAux(p_resourceName,p_allowedOperations)));
+				mcaPort.send(m_request(m_createAcpAux(p_allowedOperations)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_responseOK) -> value v_response {
 						tc_ac.stop;
 						setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly");
-						v_acpId := f_getResourceId(v_response.responsePrimitive_.content);
-						return v_acpId;//TODO: Retrieve resourceId from v_response.responsePrimitive_.content_.any_1.accessControlPolicy.resourceID;
+						v_acpId := f_getResourceId(v_response.responsePrimitive_.primitiveContent);
+						return v_acpId;
 					}
 					[] mcaPort.receive(mw_responseKO) {
 						tc_ac.stop;

OneM2M_Pixits.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Pixits.ttcn $
- *              $Id: OneM2M_Pixits.ttcn 23 2016-03-17 10:02:44Z reinaortega $
+ *              $Id: OneM2M_Pixits.ttcn 39 2016-04-08 12:34:02Z berge $
  *  @desc       Module containing Pixits for oneM2M
  *
  */
@@ -35,4 +35,8 @@ module OneM2M_Pixits {
 	
 	modulepar boolean PX_RUN_POSTAMBLE := true;
 	
+	modulepar charstring PX_SERIALIZATION := "XML";
+	
+	modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
+	
 }  // end of module

OneM2M_Templates.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Templates.ttcn $
- *              $Id: OneM2M_Templates.ttcn 24 2016-03-17 13:30:50Z berge $
+ *              $Id: OneM2M_Templates.ttcn 43 2016-04-13 12:16:12Z reinaortega $
  *  @desc       Module containing templates for oneM2M
  *
  */
@@ -30,8 +30,8 @@ module OneM2M_Templates {
 		requestPrimitive_ := p_requestPrimitive,
 		host := PX_HOST_ADDRESS,
 		xmlNamespace := PX_XML_NAMESPACE,
-		protocolBinding := omit,
-		serialization := omit
+		protocolBinding := PX_PROTOCOL_BINDING,
+		serialization := PX_SERIALIZATION
 		
 	};
 	
@@ -48,8 +48,8 @@ module OneM2M_Templates {
         		from_ := "admin:admin",
         		requestIdentifier := "m_retrieveCseBase",
         		resourceType := int5,
-				name := omit,
-				content := omit,
+				primitiveContent := omit,
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -70,8 +70,8 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_retrieveResource",
 				resourceType := p_resourceType,
-				name := omit,
-				content := omit,
+				primitiveContent := omit,
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -92,8 +92,8 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_retrieveResourceAttributeOptionTo",
         		resourceType := p_resourceType,
-				name := omit,
-				content := omit,
+				primitiveContent := omit, 
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -114,10 +114,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_retrieveResourceAttributeContentOption",
 				resourceType := p_resourceType,
-				name := omit,
-				content := {
-					any_1 := {{AttributeList_1 := p_attributeList}}
+				primitiveContent := {
+					any_1 := {{AttributeList := p_attributeList}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -134,16 +134,16 @@ module OneM2M_Templates {
     	}//end group Retrieve
 
     	group Update {
-        	template (value) RequestPrimitive m_updateContentInstance(XSD.ID p_targetResourceAddress, XSD.String p_content) := {
+        	template (value) RequestPrimitive m_updateContentInstance(XSD.ID p_targetResourceAddress, XSD.String p_primitiveContent) := {
         		operation := int3,
         		to_ := p_targetResourceAddress,
         		from_ := "admin:admin",
         		requestIdentifier := "m_updateContentInstance",
         		resourceType := int4,
-        		name := omit, 
-        		content := {
-        			any_1 := {{ContentInstance_update := m_contentUpdateContentInstance(p_content)}}
+        		primitiveContent := {
+        			any_1 := {{ContentInstance_update := m_contentUpdateContentInstance(p_primitiveContent)}}
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -164,10 +164,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updateContainer",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{Container_update := m_contentUpdateContainer}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -188,10 +188,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updateContainer",
 				resourceType := int1,
-				name := p_resourceName, 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{Container_update := m_contentUpdateContainer}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -213,10 +213,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updateAcp",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{ACP_update := m_contentUpdateAcp}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -238,10 +238,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updateGroup",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{Group_update := m_contentUpdateGroup}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -263,10 +263,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updateSchedule",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{Schedule_update := m_contentUpdateSchedule}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -288,10 +288,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updatePollingChannel",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{PollingChannel_update := m_contentUpdatePollingChannel}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -313,10 +313,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_updateSubscription",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content:= {
+				primitiveContent:= {
 							any_1 := {{Subscription_update := m_contentUpdateSubscription}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -342,7 +342,7 @@ module OneM2M_Templates {
         		requestIdentifier := "m_createContainer",
         		resourceType := int3,
         		name := omit, 
-        		content := {
+        		primitiveContent := {
         			{
         				m_contentContainer
         			}	
@@ -350,16 +350,16 @@ module OneM2M_Templates {
         		discoveryResultType := omit
         	};*/
         	
-        	/*template (value) requestPrimitive m_createResource_noName(XSD.ID p_resourceId, ResourceType p_resourceType, template (value) primitiveContent p_content) := {
+        	/*template (value) requestPrimitive m_createResource_noName(XSD.ID p_resourceId, ResourceType p_resourceType, template (value) primitiveContent p_primitiveContent) := {
         		operation := int1,
         		to_ := p_resourceId,
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createResource",
         		resourceType := p_resourceType,
         		name := omit, 
-        		content := {
+        		primitiveContent := {
         			{
-        				p_content
+        				p_primitiveContent
         			}	
         		},
         		discoveryResultType := omit
@@ -371,10 +371,10 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createAe",
         		resourceType := int2,
-        		name := p_name, 
-        		content := {
-        			any_1 := {{AE_create := m_contentCreateAe(p_accessControlPolicyIDs)}}	
+        		primitiveContent := {
+        			any_1 := {{AE_create := m_contentCreateAe(p_name, p_accessControlPolicyIDs)}}	
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -396,10 +396,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_createAcp",
 				resourceType := int1,
-				name := "NotInitialized", 
-				content := {
-					any_1 := {{ACP_create := m_contentCreateAcp (int63)}}
+				primitiveContent := {
+					any_1 := {{ACP_create := m_contentCreateAcp (omit, int63)}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -421,10 +421,10 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createAcp",
         		resourceType := int1,
-        		name := p_name, 
-        		content := {
-					any_1 := {{ACP_create := m_contentCreateAcp (p_allowedOperations)}}
+        		primitiveContent := {
+					any_1 := {{ACP_create := m_contentCreateAcp (omit, p_allowedOperations)}}
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -440,16 +440,16 @@ module OneM2M_Templates {
 
         	};
         	
-        	template (value) RequestPrimitive m_createAcpAux(in template (value)  XSD.String p_name, in template (value) AccessControlOperations p_allowedOperations ) := {
+        	template (value) RequestPrimitive m_createAcpAux(in template (value) AccessControlOperations p_allowedOperations ) := {
         		operation := int1,
         		to_ := PX_URI_CSE & PX_CSE_NAME,
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createAcp",
         		resourceType := int1,
-        		name := p_name, 
-        		content := {
-        			any_1 := {{ACP_create := m_contentCreateAcp (p_allowedOperations)}}	
+        		primitiveContent := {
+        			any_1 := {{ACP_create := m_contentCreateAcp ("MyAcp", p_allowedOperations)}}	
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -471,10 +471,11 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_createContainer",
 				resourceType := int3,
-				name := "NotInitialized", 
-				content := {
+				primitiveContent := {
+					
 					any_1 := {{Container_create := m_contentCreateContainer}}
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -496,10 +497,10 @@ module OneM2M_Templates {
     			from_ := PX_AE_ID_STEM,
     			requestIdentifier := "m_createContainer",
     			resourceType := int3,
-    			name := p_resourceName, 
-    			content := {
+    			primitiveContent := {
     				any_1 := {{Container_create := m_contentCreateContainer}}
     			},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -515,16 +516,16 @@ module OneM2M_Templates {
 
     		};
         	
-    		template (value) RequestPrimitive m_createContentInstance(XSD.ID p_resourceId, XSD.String p_content) := {
+    		template (value) RequestPrimitive m_createContentInstance(XSD.ID p_resourceId, XSD.String p_primitiveContent) := {
     			operation := int1,
     			to_ := p_resourceId,
     			from_ := "admin:admin",
     			requestIdentifier := "m_createContentInstance",
     			resourceType := int4,
-    			name := "myContent", 
-    			content := {
-    				any_1 := {{ContentInstance_create := m_contentCreateContentInstance(p_content)}}	
+    			primitiveContent := {
+    				any_1 := {{ContentInstance_create := m_contentCreateContentInstance(p_primitiveContent)}}	
     			},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -541,15 +542,15 @@ module OneM2M_Templates {
     		};
     		
 			template (value) RequestPrimitive m_createGroupBase := {
-					operation := int1,
-					to_ := "NotInitialized",
-					from_ := PX_AE_ID_STEM,
-					requestIdentifier := "m_createGroup",
-					resourceType := int9,
-					name := "NotInitialized", 
-					content := {
-						any_1 := {{Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & "NotInitialized"}, omit)}}	//TODO: p_resourceId
-					},
+				operation := int1,
+				to_ := "NotInitialized",
+				from_ := PX_AE_ID_STEM,
+				requestIdentifier := "m_createGroup",
+				resourceType := int9,
+				primitiveContent := {
+					any_1 := {{Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & "NotInitialized"}, omit)}}	//TODO: p_resourceId
+				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -571,10 +572,10 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createGroup",
         		resourceType := int9,
-        		name := p_name, 
-        		content := {
+        		primitiveContent := {
         			any_1 := {{Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & valueof(p_memberId)}, p_accessControlPolicyIDs)}}	//TODO: p_resourceId
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -591,15 +592,15 @@ module OneM2M_Templates {
         	};
         	
 			template (value) RequestPrimitive m_createPollingChannelBase := {
-					operation := int1,
-					to_ := "NotInitialized",
-					from_ := PX_AE_ID_STEM,
-					requestIdentifier := "m_createPollingChannel",
-					resourceType := int15,
-					name := "NotInitialized", 
-					content := {
-						any_1 := {{PollingChannel_create := m_contentCreatePollingChannel (omit)}}	
-					},
+				operation := int1,
+				to_ := "NotInitialized",
+				from_ := PX_AE_ID_STEM,
+				requestIdentifier := "m_createPollingChannel",
+				resourceType := int15,
+				primitiveContent := {
+					any_1 := {{PollingChannel_create := m_contentCreatePollingChannel (omit)}}	
+				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -615,16 +616,16 @@ module OneM2M_Templates {
 
 				};
         	
-        	template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_aeResourceAddress, in template (value)XSD.ID p_originatorId, in template (omit)  XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIDs ) := {
+        	template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_aeResourceAddress, in template (value)XSD.ID p_originatorId, in template (omit) AcpType p_accessControlPolicyIDs ) := {
         		operation := int1,
         		to_ := p_aeResourceAddress,
         		from_ := p_originatorId,
         		requestIdentifier := "m_createPollingChannel",
         		resourceType := int15,
-        		name := p_name, 
-        		content := {
+        		primitiveContent := {
         			any_1 := {{PollingChannel_create := m_contentCreatePollingChannel (p_accessControlPolicyIDs)}}	
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -648,10 +649,10 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createSchedule",
         		resourceType := int18,
-        		name := "NotInitialized", 
-        		content := {
+        		primitiveContent := {
         			any_1 := {{Schedule_create := m_contentCreateSchedule ({{"0,0,0 1 2,1,1,*"}})}}	
         		},
+				role := omit,
         		originatingTimestamp := omit,
         		requestExpirationTimestamp := omit,
         		resultExpirationTimestamp := omit,
@@ -673,10 +674,10 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createSchedule",
         		resourceType := int18,
-        		name := p_name, 
-        		content := {
+        		primitiveContent := {
         			any_1 := {{Schedule_create := m_contentCreateSchedule (p_scheduleElement)}}	
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -698,10 +699,10 @@ module OneM2M_Templates {
 				from_ := PX_AE_ID_STEM,
 				requestIdentifier := "m_createSubscription",
 				resourceType := int23,
-				name := "NotInitialized", 
-				content := {
+				primitiveContent := {
 					any_1 := {{Subscription_create := m_contentCreateSubscription ({"/in-cse/ae_test"})}}	
 				},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -723,10 +724,10 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_createSubscription",
         		resourceType := int23,
-        		name := p_name, 
-        		content := {
+        		primitiveContent := {
 					any_1 := {{Subscription_create := m_contentCreateSubscription (p_notificationURI)}}	
         		},
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -751,8 +752,8 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_deleteAe",
         		resourceType := omit,
-        		name := omit, 
-        		content := omit,
+        		primitiveContent := omit, 
+        		role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -774,8 +775,8 @@ module OneM2M_Templates {
         		from_ := PX_AE_ID_STEM,
         		requestIdentifier := "m_deleteAcp",
         		resourceType := omit,
-        		name := omit, 
-        		content := omit,
+        		primitiveContent := omit,
+				role := omit,
 				originatingTimestamp := omit,
 				requestExpirationTimestamp := omit,
 				resultExpirationTimestamp := omit,
@@ -795,7 +796,8 @@ module OneM2M_Templates {
 	
 	group ContentCreate {
 		
-    	template (value) AE_create m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIDs) := {
+    	template (value) AE_create m_contentCreateAe (in template (omit)  XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIDs) := {
+			resourceName := p_name,
 			labels := omit,
 			accessControlPolicyIDs := p_accessControlPolicyIDs,
 			expirationTime := omit,
@@ -808,7 +810,8 @@ module OneM2M_Templates {
 			requestReachability := false
     	};
     	
-    	template (value) ACP_create m_contentCreateAcp (in template (value) AccessControlOperations p_allowedOperations ) := {
+    	template (value) ACP_create m_contentCreateAcp (in template (omit) XSD.String p_name, in template (value) AccessControlOperations p_allowedOperations ) := {
+			resourceName := p_name,
 			labels := omit,
 			expirationTime := omit,
 			announceTo := omit,
@@ -836,6 +839,7 @@ module OneM2M_Templates {
     	template (value) Group_create m_contentCreateGroup (	in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
     												in template (value) ListOfURIs p_memberIds,
     												in template (omit) AcpType p_accessControlPolicyIDs) := {
+			resourceName := c_defaultResourceName,
 			labels := omit,
 			accessControlPolicyIDs := p_accessControlPolicyIDs,
 			expirationTime := omit,
@@ -851,6 +855,7 @@ module OneM2M_Templates {
     	};
     	
     	template (value) PollingChannel_create m_contentCreatePollingChannel (	in template (omit) AcpType p_accessControlPolicyIDs) := {
+			resourceName := c_defaultResourceName,
 			labels := omit,
 			accessControlPolicyIDs := p_accessControlPolicyIDs,
 			expirationTime := omit,
@@ -858,6 +863,7 @@ module OneM2M_Templates {
     	};
     	
     	template (value) Schedule_create m_contentCreateSchedule (in template (value) ScheduleEntries p_scheduleElement) := {
+			resourceName := c_defaultResourceName,
 			labels := omit,
             expirationTime := omit,
             announceTo := omit,
@@ -866,6 +872,7 @@ module OneM2M_Templates {
     	};
     	
     	template (value) Subscription_create m_contentCreateSubscription (in template (value) ListOfURIs p_notificationURI) := {
+			resourceName := c_defaultResourceName,
 			labels := omit,
 			accessControlPolicyIDs := omit,
 			expirationTime := omit,
@@ -886,21 +893,23 @@ module OneM2M_Templates {
             subscriberURI := omit
     	};
     	
-    	template (value) ContentInstance_create m_contentCreateContentInstance(XSD.String p_content) := {
+    	template (value) ContentInstance_create m_contentCreateContentInstance(XSD.String p_primitiveContent) := {
+			resourceName := c_defaultResourceName,
 			labels := omit,
             announceTo := omit,
 			contentInfo := "a",
             contentSize := omit,
             ontologyRef := omit,
     		content_ := { 
-    			embed_values := {p_content},
+    			embed_values := {p_primitiveContent},
     			attr := omit,
     			elem_list := {}  
     		}
 		};
 		
     	template (value) Container_create m_contentCreateContainer := {
-    		labels := omit,
+			resourceName := c_defaultResourceName,
+			labels := omit,
 			accessControlPolicyIDs := omit,
 			expirationTime := omit,
 			announceTo := omit,
@@ -982,14 +991,14 @@ module OneM2M_Templates {
 			notificationEventCat := omit
 		};
     	
-    	template (value) ContentInstance_update m_contentUpdateContentInstance(XSD.String p_content) := {
+    	template (value) ContentInstance_update m_contentUpdateContentInstance(XSD.String p_primitiveContent) := {
 			labels := omit,
             announceTo := omit,
 			contentInfo := omit,
             contentSize := omit,
             ontologyRef := omit,
     		content_ := { 
-    			embed_values := {p_content},
+    			embed_values := {p_primitiveContent},
     			attr := omit,
     			elem_list := {}  
     		}
@@ -1011,20 +1020,7 @@ module OneM2M_Templates {
 	
 	group SpecialContents {
 		
-		template (value) AttributeList_1 m_contentAttributeList (in template (value) Attribute p_attribute) := {
-			attribute_list := {
-        		p_attribute
-        	}
-		};
-		
-		template (value) AttributeList_1 m_contentAttributeList_2(	in template (value) Attribute p_attribute1,
-															in template (value) Attribute p_attribute2) := {
-				attribute_list := {
-					p_attribute1,
-					p_attribute2
-				}
-			};
-		
+				
 	}//end gropu SpecialContents
 	
 	group ResponsePrimitives {
@@ -1032,7 +1028,7 @@ module OneM2M_Templates {
     		responsePrimitive_ := {
     			responseStatusCode := p_statusCode,
     			requestIdentifier := ?,
-    			content := *,
+    			primitiveContent := *,
 				to_ := *,
     			from_ := *,
 				originatingTimestamp := *,
@@ -1045,7 +1041,7 @@ module OneM2M_Templates {
     		responsePrimitive_ := {
     			responseStatusCode := (int2000, int2001, int2002, int2004),
     			requestIdentifier := ?,
-    			content := *,
+    			primitiveContent := *,
 				to_ := *,
     			from_ := *,
 				originatingTimestamp := *,
@@ -1058,7 +1054,7 @@ module OneM2M_Templates {
     		responsePrimitive_ := {
     			responseStatusCode := complement(int2000, int2001, int2002, int2004),
     			requestIdentifier := ?,
-    			content := *,
+    			primitiveContent := *,
 				to_ := *,
     			from_ := *,
     			originatingTimestamp := *,

OneM2M_Testcases.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 24 2016-03-17 13:30:50Z berge $
+ *              $Id: OneM2M_Testcases.ttcn 43 2016-04-13 12:16:12Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -328,39 +328,57 @@ module OneM2M_Testcases {
 					
 					testcase TC_CSE_DMR_CRE_BV_001_01() runs on M2M system M2MSystem {
 						// Local variables
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
+						
+						v_createRequest.primitiveContent.any_1[0].Container_create.resourceName := omit;
                         
                         f_CSE_DMR_CRE_BV_001(int3, m_createContainerBase);//Container
 					}
 
 					testcase TC_CSE_DMR_CRE_BV_001_02() runs on M2M system M2MSystem {
 						// Local variables
+						var template RequestPrimitive v_createRequest := m_createGroupBase;
+						
+						v_createRequest.primitiveContent.any_1[0].Group_create.resourceName := omit;
 						
 						f_CSE_DMR_CRE_BV_001(int9, m_createGroupBase);//Group
 					}
 					
 					testcase TC_CSE_DMR_CRE_BV_001_03() runs on M2M system M2MSystem {
 						// Local variables
+						var template RequestPrimitive v_createRequest := m_createAcpBase;
+						
+						v_createRequest.primitiveContent.any_1[0].ACP_create.resourceName := omit;
 	
 						f_CSE_DMR_CRE_BV_001(int1, m_createAcpBase);//AccessControlPolicy
 					}
 				
 					testcase TC_CSE_DMR_CRE_BV_001_04() runs on M2M system M2MSystem {
 						// Local variables
+						var template RequestPrimitive v_createRequest := m_createScheduleBase;
+						
+						v_createRequest.primitiveContent.any_1[0].Schedule_create.resourceName := omit;
 	
 						f_CSE_DMR_CRE_BV_001(int18, m_createScheduleBase);//Schedule
 					}
 					
 					testcase TC_CSE_DMR_CRE_BV_001_05() runs on M2M system M2MSystem {
 						// Local variables
+						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
+						
+						v_createRequest.primitiveContent.any_1[0].PollingChannel_create.resourceName := omit;
 	
 						f_CSE_DMR_CRE_BV_001(int15, m_createPollingChannelBase);//PollingChannel
 					}
 					
 					testcase TC_CSE_DMR_CRE_BV_001_06() runs on M2M system M2MSystem {
-							// Local variables
-	
-							f_CSE_DMR_CRE_BV_001(int23, m_createSubscriptionBase);//Subscription
-						}
+						// Local variables
+						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
+						
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.resourceName := omit;
+
+						f_CSE_DMR_CRE_BV_001(int23, m_createSubscriptionBase);//Subscription
+					}
 					
     				function f_CSE_DMR_CRE_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M {
     				
@@ -383,7 +401,7 @@ module OneM2M_Testcases {
     									
     					// Test Body
     					
-    					v_request := f_getCreateRequestPrimitive(p_resourceType, v_aeResourceAddress, omit, omit, p_requestPrimitive);
+    					v_request := f_getCreateRequestPrimitive(p_resourceType, v_aeResourceAddress, omit, p_requestPrimitive);
 						
     					mcaPort.send(m_request(v_request));
     					tc_ac.start;
@@ -427,7 +445,7 @@ module OneM2M_Testcases {
 					testcase TC_CSE_DMR_CRE_BV_002_03() runs on M2M system M2MSystem {
 						// Local variables
                         
-						f_CSE_DMR_CRE_BV_002(int1, m_createAcpBase);//accessControlPolicy
+						f_CSE_DMR_CRE_BV_002(int1, m_createAcpBase );//accessControlPolicy
 					}
 
 					testcase TC_CSE_DMR_CRE_BV_002_04() runs on M2M system M2MSystem {
@@ -454,7 +472,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_parentResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName;
 										   
 						// Test control
@@ -468,7 +485,7 @@ module OneM2M_Testcases {
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi); 				
 									
 						// Test Body
-						v_request := f_getCreateRequestPrimitive(p_resourceType, v_parentResourceAddress, v_resourceName, omit, p_requestPrimitive);
+						v_request := f_getCreateRequestPrimitive(p_resourceType, v_parentResourceAddress, omit, p_requestPrimitive);
 						
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -539,7 +556,6 @@ module OneM2M_Testcases {
     					var RequestPrimitive v_request;
     					var XSD.ID v_resourceId_content;
     					var XSD.String v_aeName := "ae_test";
-    					var XSD.String v_resourceName := "myResource";
     					var XSD.String v_parentResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName;
     										   
     					// Test control
@@ -551,12 +567,11 @@ module OneM2M_Testcases {
     				
     					// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-    					f_createResource(p_resourceType, v_parentResourceAddress, v_resourceName, p_requestPrimitive); 				
+    					f_createResource(p_resourceType, v_parentResourceAddress, p_requestPrimitive); 				
     									
     					// Test Body
-    					v_request := f_getCreateRequestPrimitive(p_resourceType,v_parentResourceAddress,v_resourceName, omit, p_requestPrimitive);
-    					
-    					mcaPort.send(m_request(v_request));
+    					p_requestPrimitive.requestIdentifier := "Existing resource";
+    					mcaPort.send(m_request(valueof(p_requestPrimitive)));
     					tc_ac.start;
     					alt {
     						[] mcaPort.receive(mw_response(int4105)) -> value v_response {
@@ -624,7 +639,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName;
     										   
 						// Test control
@@ -643,9 +657,9 @@ module OneM2M_Testcases {
     									
 						// Test Body
 						if(p_resourceType == int15) {
-							v_request := valueof(m_createPollingChannel(v_aeResourceAddress, PX_AE_ID_STEM, v_resourceName, omit));
+							v_request := valueof(m_createPollingChannel(v_aeResourceAddress, PX_AE_ID_STEM, omit));
 						} else {
-							v_request := f_getCreateRequestPrimitive(p_resourceType,v_aeResourceAddress,v_resourceName, omit, p_requestPrimitive);
+							v_request := f_getCreateRequestPrimitive(p_resourceType,v_aeResourceAddress, omit, p_requestPrimitive);
 						}
 						
 						mcaPort.send(m_request(v_request));
@@ -725,7 +739,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
     										   
 						// Test control
@@ -737,10 +750,10 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResource(p_resourceType, v_aeResourceAddress & "/" & v_resourceName)));
+						mcaPort.send(m_request(m_retrieveResource(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_responseOK) -> value v_response {
@@ -772,7 +785,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
     										   
 						// Test control
@@ -786,7 +798,7 @@ module OneM2M_Testcases {
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResource(int3, v_aeResourceAddress & "/" & v_resourceName)));
+						mcaPort.send(m_request(m_retrieveResource(int3, v_aeResourceAddress & "/" & c_defaultResourceName)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(int4004)) -> value v_response {
@@ -831,7 +843,7 @@ module OneM2M_Testcases {
 						// Local variables
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
 						
-						v_requestPrimitive.content.any_1[0].ACP_create.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
+						v_requestPrimitive.primitiveContent.any_1[0].ACP_create.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
 						
 						f_CSE_DMR_RET_BO_003(int1, v_requestPrimitive);//AccessControlPolicy
 					}
@@ -874,10 +886,10 @@ module OneM2M_Testcases {
 						// Preamble
 						f_preamble_registerAe(v_aeName, int61);//c_CUDNDi);
 						
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResource(p_resourceType, v_aeResourceAddress & "/" & v_resourceName)));
+						mcaPort.send(m_request(m_retrieveResource(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(int4103)) -> value v_response {
@@ -958,7 +970,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
 						var XSD.String v_attribute := "#pi";
     										   
@@ -971,15 +982,15 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResourceAttributeToOption(p_resourceType, v_aeResourceAddress & "/" & v_resourceName & v_attribute)));
+						mcaPort.send(m_request(m_retrieveResourceAttributeToOption(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName & v_attribute)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_responseOK) -> value v_response {
 								tc_ac.stop;
-								if(ischosen(v_response.responsePrimitive_.content.any_1[0].AttributeList_1)){
+								if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList)){
 									setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly");
 								} else {
 									setverdict(fail, testcasename() & ": Requested attribute not retrieved");
@@ -1048,7 +1059,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
 						var XSD.String v_attribute := "#pi";
     										   
@@ -1061,17 +1071,17 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & v_resourceName, 
-																						m_contentAttributeList({"parentID", {omit, omit, {""}}}))));
+						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName, 
+																						{"parentID"})));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_responseOK) -> value v_response {
 								tc_ac.stop;
-								if(ischosen(v_response.responsePrimitive_.content.any_1[0].AttributeList_1)){
-									if(v_response.responsePrimitive_.content.any_1[0].AttributeList_1.attribute_list[0].name == "parentID"){
+								if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList)){
+									if(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList[0] == "parentID"){
 										setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly");
 									} else {
 										setverdict(fail, testcasename() & ": Requested attribute not retrieved");
@@ -1143,7 +1153,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
 						var XSD.String v_attribute := "#pi";
     										   
@@ -1156,18 +1165,17 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & v_resourceName, 
-																						m_contentAttributeList_2({"parentID", {omit, omit, {""}}},
-																													{"creationTime", {omit, omit, {""}}}))));
+						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName, 
+																						{"parentID", "creationTime"})));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_responseOK) -> value v_response {
 								tc_ac.stop;
-								if(ischosen(v_response.responsePrimitive_.content.any_1[0].AttributeList_1)){
-									if(v_response.responsePrimitive_.content.any_1[0].AttributeList_1.attribute_list[0].name == "parentID"){
+								if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList)){
+									if(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList[0] == "parentID"){
 										setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly");
 									} else {
 										setverdict(fail, testcasename() & ": Requested attribute not retrieved");
@@ -1239,7 +1247,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
 						var XSD.String v_attribute := "#lbl";
     										   
@@ -1252,17 +1259,17 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress,  p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & v_resourceName, 
-																						m_contentAttributeList({"labels", {omit, omit, {""}}}))));
+						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName, 
+																						{"labels"})));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_responseOK) -> value v_response {
 								tc_ac.stop;
-								if(ischosen(v_response.responsePrimitive_.content.any_1[0].AttributeList_1)){
-									if(v_response.responsePrimitive_.content.any_1[0].AttributeList_1.attribute_list[0].name == "parentID"){
+								if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList)){
+									if(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList[0] == "parentID"){
 										setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly");
 									} else {
 										setverdict(fail, testcasename() & ": Requested attribute not retrieved");
@@ -1334,7 +1341,6 @@ module OneM2M_Testcases {
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & v_aeName;
 						var XSD.String v_attribute := "#pi";
     										   
@@ -1347,18 +1353,17 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_requestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_requestPrimitive); 				
     									
 						// Test Body
-						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & v_resourceName, 
-																						m_contentAttributeList_2({"labels", {omit, omit, {""}}},
-																													{"announceTo", {omit, omit, {""}}}))));
+						mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(p_resourceType, v_aeResourceAddress & "/" & c_defaultResourceName, 
+																						{"labels", "announceTo"})));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_responseOK) -> value v_response {
 								tc_ac.stop;
-								if(ischosen(v_response.responsePrimitive_.content.any_1[0].AttributeList_1)){
-									if(v_response.responsePrimitive_.content.any_1[0].AttributeList_1.attribute_list[0].name == "parentID"){
+								if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList)){
+									if(v_response.responsePrimitive_.primitiveContent.any_1[0].AttributeList[0] == "parentID"){
 										setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly");
 									} else {
 										setverdict(fail, testcasename() & ": Requested attribute not retrieved");
@@ -1395,8 +1400,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						
-						v_createRequest.content.any_1[0].Container_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Container_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Container_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.labels := v_labels_2;
 						
                         f_CSE_DMR_UPD_BV_001(int3, v_createRequest, v_updateRequest);//Container
 					}
@@ -1408,8 +1413,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						v_createRequest.content.any_1[0].Group_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Group_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Group_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Group_update.labels := v_labels_2;
 
 						f_CSE_DMR_UPD_BV_001(int9, v_createRequest, v_updateRequest);//Group
 					}
@@ -1421,8 +1426,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 
-						v_createRequest.content.any_1[0].ACP_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].ACP_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].ACP_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].ACP_update.labels := v_labels_2;
 
 						f_CSE_DMR_UPD_BV_001(int1, v_createRequest, v_updateRequest);//ACP
 						
@@ -1435,8 +1440,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
-						v_createRequest.content.any_1[0].Schedule_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Schedule_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Schedule_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Schedule_update.labels := v_labels_2;
 
 						f_CSE_DMR_UPD_BV_001(int18, v_createRequest, v_updateRequest);//Schedule
 					
@@ -1449,8 +1454,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 
-						v_createRequest.content.any_1[0].PollingChannel_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].PollingChannel_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].PollingChannel_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.labels := v_labels_2;
 
 						f_CSE_DMR_UPD_BV_001(int15, v_createRequest, v_updateRequest);//PollingChannel
 					}
@@ -1462,8 +1467,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 
-						v_createRequest.content.any_1[0].Subscription_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Subscription_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.labels := v_labels_2;
 
 						f_CSE_DMR_UPD_BV_001(int23, v_createRequest, v_updateRequest);//Subscription
 					
@@ -1475,10 +1480,9 @@ module OneM2M_Testcases {
 						var M2MResponsePrimitive v_response;
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
-						var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
+						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
+						var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
     										   
 						// Test control
     				
@@ -1489,10 +1493,10 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_createRequestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_createRequestPrimitive); 				
     									
 						// Test Body
-						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, v_resourceName, p_updateRequestPrimitive);
+						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, p_updateRequestPrimitive);
 						
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -1525,7 +1529,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_2 := {"VALUE_2"};
                         var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
-						v_updateRequest.content.any_1[0].Container_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.labels := v_labels_2;
                         
 						f_CSE_DMR_UPD_BV_002(int3, m_createContainerBase, v_updateRequest);//Container
 					}
@@ -1535,7 +1539,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						v_updateRequest.content.any_1[0].Group_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Group_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_002(int9, m_createGroupBase, v_updateRequest);//Group
 					}
@@ -1545,7 +1549,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 
-						v_updateRequest.content.any_1[0].ACP_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].ACP_update.labels := v_labels_2;
 							
 						f_CSE_DMR_UPD_BV_002(int1, m_createAcpBase,v_updateRequest);//AccessControlPolicy
 					}
@@ -1555,7 +1559,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
-						v_updateRequest.content.any_1[0].Schedule_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Schedule_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_002(int18, m_createScheduleBase,v_updateRequest);//Schedule
 					}
@@ -1565,7 +1569,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 
-						v_updateRequest.content.any_1[0].PollingChannel_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_002(int15, m_createPollingChannelBase,v_updateRequest);//PollingChannel
 					}
@@ -1575,7 +1579,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_2 := {"VALUE_2"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 
-						v_updateRequest.content.any_1[0].Subscription_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_002(int23, m_createSubscriptionBase,v_updateRequest);//Subscription
 						}
@@ -1586,10 +1590,9 @@ module OneM2M_Testcases {
 						var M2MResponsePrimitive v_response;
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
-    					var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
+						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
+    					var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
     										   
 						// Test control
     				
@@ -1600,10 +1603,10 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_createRequestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_createRequestPrimitive); 				
     									
 						// Test Body
-						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, v_resourceName, p_updateRequestPrimitive);
+						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, p_updateRequestPrimitive);
 						
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -1638,8 +1641,8 @@ module OneM2M_Testcases {
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						
-						v_createRequest.content.any_1[0].Container_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Container_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Container_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.labels := v_labels_2;
                         
 						f_CSE_DMR_UPD_BV_003(int3, v_createRequest, v_updateRequest);//Container
 					}
@@ -1651,8 +1654,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						v_createRequest.content.any_1[0].Group_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Group_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Group_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Group_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_003(int9, v_createRequest, v_updateRequest);//Group
 					}
@@ -1664,8 +1667,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 
-						v_createRequest.content.any_1[0].ACP_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].ACP_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].ACP_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].ACP_update.labels := v_labels_2;
 							
 						f_CSE_DMR_UPD_BV_003(int1, v_createRequest, v_updateRequest);//AccessControlPolicy
 					}
@@ -1677,8 +1680,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
-						v_createRequest.content.any_1[0].Schedule_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Schedule_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Schedule_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Schedule_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_003(int18, v_createRequest, v_updateRequest);//Schedule
 					}
@@ -1690,8 +1693,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 
-						v_createRequest.content.any_1[0].PollingChannel_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].PollingChannel_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].PollingChannel_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_003(int15, v_createRequest, v_updateRequest);//PollingChannel
 					}
@@ -1703,8 +1706,8 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 
-						v_createRequest.content.any_1[0].Subscription_create.labels := v_labels_1;
-						v_updateRequest.content.any_1[0].Subscription_update.labels := v_labels_2;
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.labels := v_labels_1;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.labels := v_labels_2;
 						
 						f_CSE_DMR_UPD_BV_003(int23, v_createRequest, v_updateRequest);//Subscription
 						}
@@ -1715,10 +1718,9 @@ module OneM2M_Testcases {
 						var M2MResponsePrimitive v_response;
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeName := "ae_test";
-						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
-						var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
+						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
+						var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
     										   
 						// Test control
     				
@@ -1729,10 +1731,10 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_createRequestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_createRequestPrimitive); 				
     									
 						// Test Body
-						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, v_resourceName, p_updateRequestPrimitive);
+						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, p_updateRequestPrimitive);
 						
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -1769,11 +1771,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
-						v_createRequest.content.any_1[0].Container_create.labels := v_labels_1;
-						v_createRequest.content.any_1[0].Container_create.maxNrOfInstances := v_maxNrOfInstances;
-						v_updateRequest.content.any_1[0].Container_update.labels := v_labels_2;
-						v_updateRequest.content.any_1[0].Container_update.maxNrOfInstances := 0;//TODO
-						v_updateRequest.content.any_1[0].Container_update.accessControlPolicyIDs := v_acp;
+						v_createRequest.primitiveContent.any_1[0].Container_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Container_create.maxNrOfInstances := v_maxNrOfInstances;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.maxNrOfInstances := 0;//TODO
+						v_updateRequest.primitiveContent.any_1[0].Container_update.accessControlPolicyIDs := v_acp;
                         
 						f_CSE_DMR_UPD_BV_004(int3, v_createRequest, v_updateRequest);//Container
 					}
@@ -1787,11 +1789,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						v_createRequest.content.any_1[0].Group_create.labels := v_labels_1;
-						v_createRequest.content.any_1[0].Group_create.groupName := "MyGroupName";
-						v_updateRequest.content.any_1[0].Group_update.labels := v_labels_2;
-						v_updateRequest.content.any_1[0].Group_update.groupName:= "";//TODO Set to NULL
-						v_updateRequest.content.any_1[0].Group_update.accessControlPolicyIDs := v_acp;
+						v_createRequest.primitiveContent.any_1[0].Group_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Group_create.groupName := "MyGroupName";
+						v_updateRequest.primitiveContent.any_1[0].Group_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Group_update.groupName:= "";//TODO Set to NULL
+						v_updateRequest.primitiveContent.any_1[0].Group_update.accessControlPolicyIDs := v_acp;
                         
 						f_CSE_DMR_UPD_BV_004(int9, v_createRequest, v_updateRequest);//Group
 					}
@@ -1803,9 +1805,9 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 
-						v_createRequest.content.any_1[0].ACP_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].ACP_create.labels := v_labels_1;
 						//v_createRequest.content.any_1[0].ACP_create.groupName := "MyGroupName";TODO Need to find Attribute 2
-						v_updateRequest.content.any_1[0].ACP_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].ACP_update.labels := v_labels_2;
 						//v_updateRequest.content.any_1[0].ACP_update.groupName:= "";//TODO Set to NULL
 						//v_updateRequest.content.any_1[0].ACP_update.accessControlPolicyIDs := v_acp; TODO Need to find Attribute 3
       							
@@ -1819,9 +1821,9 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
-						v_createRequest.content.any_1[0].Schedule_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Schedule_create.labels := v_labels_1;
 						//v_createRequest.content.any_1[0].Schedule_create.groupName := "MyGroupName";TODO Need to find Attribute 2
-						v_updateRequest.content.any_1[0].Schedule_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Schedule_update.labels := v_labels_2;
 						//v_updateRequest.content.any_1[0].Schedule_update.groupName:= "";//TODO Set to NULL
 						//v_updateRequest.content.any_1[0].Schedule_update.accessControlPolicyIDs := v_acp; TODO Need to find Attribute 3
                 						
@@ -1836,11 +1838,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 
-						v_createRequest.content.any_1[0].PollingChannel_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].PollingChannel_create.labels := v_labels_1;
 						//v_createRequest.content.any_1[0].PollingChannel_create.groupName := "MyGroupName";TODO Need to find Attribute 2
-						v_updateRequest.content.any_1[0].PollingChannel_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.labels := v_labels_2;
 						//v_updateRequest.content.any_1[0].PollingChannel_update.groupName:= "";//TODO Set to NULL
-						v_updateRequest.content.any_1[0].PollingChannel_update.accessControlPolicyIDs := v_acp; 
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.accessControlPolicyIDs := v_acp; 
       						
 						f_CSE_DMR_UPD_BV_004(int15, v_createRequest, v_updateRequest);//PollingChannel
 					}
@@ -1853,11 +1855,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 
-						v_createRequest.content.any_1[0].Subscription_create.labels := v_labels_1;
-						v_createRequest.content.any_1[0].Subscription_create.expirationCounter := 5;
-						v_updateRequest.content.any_1[0].Subscription_update.labels := v_labels_2;
-						v_updateRequest.content.any_1[0].Subscription_update.expirationCounter := 1;//TODO Set to NULL
-						v_updateRequest.content.any_1[0].Subscription_update.accessControlPolicyIDs := v_acp; 
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.expirationCounter := 5;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.expirationCounter := 1;//TODO Set to NULL
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.accessControlPolicyIDs := v_acp; 
       							
 						f_CSE_DMR_UPD_BV_004(int23, v_createRequest, v_updateRequest);//Subscription
 						}
@@ -1868,10 +1870,9 @@ module OneM2M_Testcases {
 						var M2MResponsePrimitive v_response;
 						var RequestPrimitive v_request;
 						var XSD.ID v_resourceId_content;
-						var XSD.String v_resourceName := "myResource";
 						var XSD.String v_aeName := "ae_test";
 						var XSD.String v_aeResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName ;
-						var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & v_resourceName;
+						var XSD.String v_targetResourceAddress := "/" & PX_CSE_NAME & "/" & v_aeName & "/" & c_defaultResourceName;
     										   
 						// Test control
     				
@@ -1882,10 +1883,10 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_createRequestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_createRequestPrimitive); 				
     									
 						// Test Body
-						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, v_resourceName, p_updateRequestPrimitive);
+						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, p_updateRequestPrimitive);
 						
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -1922,11 +1923,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 
-						v_createRequest.content.any_1[0].Container_create.labels := v_labels_1;
-						v_createRequest.content.any_1[0].Container_create.maxNrOfInstances := v_maxNrOfInstances;
-						v_updateRequest.content.any_1[0].Container_update.labels := v_labels_2;
-						v_updateRequest.content.any_1[0].Container_update.maxNrOfInstances := 0;//TODO
-						v_updateRequest.content.any_1[0].Container_update.accessControlPolicyIDs := v_acp;
+						v_createRequest.primitiveContent.any_1[0].Container_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Container_create.maxNrOfInstances := v_maxNrOfInstances;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Container_update.maxNrOfInstances := 0;//TODO
+						v_updateRequest.primitiveContent.any_1[0].Container_update.accessControlPolicyIDs := v_acp;
                         
 						f_CSE_DMR_UPD_BO_005(int3, v_createRequest, v_updateRequest);//Container
 					}
@@ -1940,11 +1941,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 
-						v_createRequest.content.any_1[0].Group_create.labels := v_labels_1;
-						v_createRequest.content.any_1[0].Group_create.groupName := "MyGroupName";
-						v_updateRequest.content.any_1[0].Group_update.labels := v_labels_2;
-						v_updateRequest.content.any_1[0].Group_update.groupName:= "";//TODO Set to NULL
-						v_updateRequest.content.any_1[0].Group_update.accessControlPolicyIDs := v_acp;
+						v_createRequest.primitiveContent.any_1[0].Group_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Group_create.groupName := "MyGroupName";
+						v_updateRequest.primitiveContent.any_1[0].Group_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Group_update.groupName:= "";//TODO Set to NULL
+						v_updateRequest.primitiveContent.any_1[0].Group_update.accessControlPolicyIDs := v_acp;
                         
 						f_CSE_DMR_UPD_BO_005(int9, v_createRequest, v_updateRequest);//Group
 					}
@@ -1956,9 +1957,9 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 
-						v_createRequest.content.any_1[0].ACP_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].ACP_create.labels := v_labels_1;
 						//v_createRequest.content.any_1[0].ACP_create.groupName := "MyGroupName";TODO Need to find Attribute 2
-						v_updateRequest.content.any_1[0].ACP_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].ACP_update.labels := v_labels_2;
 						//v_updateRequest.content.any_1[0].ACP_update.groupName:= "";//TODO Set to NULL
 						//v_updateRequest.content.any_1[0].ACP_update.accessControlPolicyIDs := v_acp; TODO Need to find Attribute 3
       							
@@ -1972,9 +1973,9 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 
-						v_createRequest.content.any_1[0].Schedule_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Schedule_create.labels := v_labels_1;
 						//v_createRequest.content.any_1[0].Schedule_create.groupName := "MyGroupName";TODO Need to find Attribute 2
-						v_updateRequest.content.any_1[0].Schedule_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Schedule_update.labels := v_labels_2;
 						//v_updateRequest.content.any_1[0].Schedule_update.groupName:= "";//TODO Set to NULL
 						//v_updateRequest.content.any_1[0].Schedule_update.accessControlPolicyIDs := v_acp; TODO Need to find Attribute 3
                 						
@@ -1989,11 +1990,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 
-						v_createRequest.content.any_1[0].PollingChannel_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].PollingChannel_create.labels := v_labels_1;
 						//v_createRequest.content.any_1[0].PollingChannel_create.groupName := "MyGroupName";TODO Need to find Attribute 2
-						v_updateRequest.content.any_1[0].PollingChannel_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.labels := v_labels_2;
 						//v_updateRequest.content.any_1[0].PollingChannel_update.groupName:= "";//TODO Set to NULL
-						v_updateRequest.content.any_1[0].PollingChannel_update.accessControlPolicyIDs := v_acp; 
+						v_updateRequest.primitiveContent.any_1[0].PollingChannel_update.accessControlPolicyIDs := v_acp; 
       						
 						f_CSE_DMR_UPD_BO_005(int15, v_createRequest, v_updateRequest);//PollingChannel
 					}
@@ -2006,11 +2007,11 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 
-						v_createRequest.content.any_1[0].Subscription_create.labels := v_labels_1;
-						v_createRequest.content.any_1[0].Subscription_create.expirationCounter := 5;
-						v_updateRequest.content.any_1[0].Subscription_update.labels := v_labels_2;
-						v_updateRequest.content.any_1[0].Subscription_update.expirationCounter := 1;//TODO Set to NULL
-						v_updateRequest.content.any_1[0].Subscription_update.accessControlPolicyIDs := v_acp; 
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.labels := v_labels_1;
+						v_createRequest.primitiveContent.any_1[0].Subscription_create.expirationCounter := 5;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.labels := v_labels_2;
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.expirationCounter := 1;//TODO Set to NULL
+						v_updateRequest.primitiveContent.any_1[0].Subscription_update.accessControlPolicyIDs := v_acp; 
       							
 						f_CSE_DMR_UPD_BO_005(int23, v_createRequest, v_updateRequest);//Subscription
 						}
@@ -2035,10 +2036,10 @@ module OneM2M_Testcases {
     				
 						// Preamble
 						f_preamble_registerAe(v_aeName, int63);//c_CRUDNDi);
-						f_createResource(p_resourceType, v_aeResourceAddress, v_resourceName, p_createRequestPrimitive); 				
+						f_createResource(p_resourceType, v_aeResourceAddress, p_createRequestPrimitive); 				
     									
 						// Test Body
-						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, v_resourceName, p_updateRequestPrimitive);
+						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_targetResourceAddress, p_updateRequestPrimitive);
 						
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;

OneM2M_TypesAndValues.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TypesAndValues.ttcn $
- *              $Id: OneM2M_TypesAndValues.ttcn 20 2016-03-16 10:34:05Z reinaortega $
+ *              $Id: OneM2M_TypesAndValues.ttcn 43 2016-04-13 12:16:12Z reinaortega $
  *  @desc       Module containing types and values for oneM2M
  *
  */
@@ -19,6 +19,7 @@ module OneM2M_TypesAndValues {
 	/* Constants */
 	const charstring c_uri_cse := "/~/in-cse/";
 	const charstring c_cse_name := "in-cse";
+	const XSD.String c_defaultResourceName;
 	
 	//AccessControlOperations
 	const XSD.Integer c_C   := 1;

UsefulTtcn3Types.ttcn

-/*******************************************************************************
-* Copyright (c) 2000-2016 Ericsson Telecom AB
-*
-* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D                       
-*
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*******************************************************************************/
-//
-//  File:          UsefulTtcn3Types.ttcn
-//  Description:
-//  References:
-//  Rev:
-//  Prodnr:
-//  Updated:
-//  Contact:       http://ttcn.ericsson.se
-//
-////////////////////////////////////////////////////////////////////////////////
-module UsefulTtcn3Types {
-
-
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
-
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
-
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
-
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
-
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
-
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
-
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
-
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
-
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
-
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
-
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
-
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
-
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
-
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
-
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
-
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
-
-    type record IDLfixed
-    {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
-    }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
-
-    /*
-    type charstring char length (1);
-
-    NOTE 1: The name of this useful type is the same as the TTCN-3 keyword used to denote universal
-    charstring values in the quadraple form. In general it is disallowed to use TTCN-3 keywords as
-    identifiers. The "char" useful type is a solitary exception and allowed only for backward compatibility
-    with previous versions of the TTCN-3 standard. (except Titan doesn't)
-
-    NOTE 2: The special string "8 bit" defined in clause 28.2.3 may be used with this type to specify a given encoding
-    for its values. Also, other properties of the base type can be changed by using attribute mechanisms.
-    */
-
-    type universal charstring uchar length (1);
-
-    /*
-    NOTE: Special strings defined in clause 28.2.3 except "8 bit" may be used with this type to specify a given
-    encoding for its values. Also, other properties of the base type can be changed by using attribute
-    mechanisms.
-    */
-
-    type bitstring bit length (1);
-
-    type hexstring hex length (1);
-
-    type octetstring octet length (1);
-
-}
-with {
-encode "XML";
-}
+/*******************************************************************************
+* Copyright (c) 2000-2016 Ericsson Telecom AB
+*
+* XSD to TTCN-3 Translator version: CRL 113 200/5 R4D                       
+*
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*******************************************************************************/
+//
+//  File:          UsefulTtcn3Types.ttcn
+//  Description:
+//  References:
+//  Rev:
+//  Prodnr:
+//  Updated:
+//  Contact:       http://ttcn.ericsson.se
+//
+////////////////////////////////////////////////////////////////////////////////
+module UsefulTtcn3Types {
+
+
+    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+
+    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+
+    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+
+    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+
+    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+
+    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+
+    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+
+    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+
+    type float IEEE754float with { variant "/*IEEE754 float*/" };
+
+    type float IEEE754double with { variant "/*IEEE754 double*/" };
+
+    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+
+    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+
+    type universal charstring utf8string with { variant "/*UTF-8*/" };
+
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+
+    type record IDLfixed
+    {
+    	unsignedshort digits,
+    	short scale,
+    	charstring value_
+    }
+    with {
+    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
+    };
+
+    /*
+    type charstring char length (1);
+
+    NOTE 1: The name of this useful type is the same as the TTCN-3 keyword used to denote universal
+    charstring values in the quadraple form. In general it is disallowed to use TTCN-3 keywords as
+    identifiers. The "char" useful type is a solitary exception and allowed only for backward compatibility
+    with previous versions of the TTCN-3 standard. (except Titan doesn't)
+
+    NOTE 2: The special string "8 bit" defined in clause 28.2.3 may be used with this type to specify a given encoding
+    for its values. Also, other properties of the base type can be changed by using attribute mechanisms.
+    */
+
+    type universal charstring uchar length (1);
+
+    /*
+    NOTE: Special strings defined in clause 28.2.3 except "8 bit" may be used with this type to specify a given
+    encoding for its values. Also, other properties of the base type can be changed by using attribute
+    mechanisms.
+    */
+
+    type bitstring bit length (1);
+
+    type hexstring hex length (1);
+
+    type octetstring octet length (1);
+
+}
+with {
+encode "XML";
+}