Merge branch 'Release1' of https://git.onem2m.org/TST/ATS into Release1

LibOneM2M/OneM2M_Pixits.ttcn

@@ -18,21 +18,14 @@ module OneM2M_Pixits {
 	
 	group TestAdapterParameters {}
 
-	modulepar boolean PX_DELETE_CREATED_RESOURCES 	:= true;
-	
-	modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED 	:= "/ae_test";
-	
-	modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
 	
-	modulepar charstring PX_SUT_ADDRESS 			:= "127.0.0.1:8080";
+		group IutParameters {
 			
-	modulepar charstring PX_AE1_ADDRESS				:= "127.0.0.1:3131";
+			modulepar boolean PX_MN_CSE	:= true; 
 			
-	modulepar charstring PX_AE2_ADDRESS				:= "127.0.0.1:3132";
-	
-	modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
+			modulepar boolean PX_IN_CSE	:= false; 
 		
-	modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
+			modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
 			
 			/**
 			 * @desc IUT CSE Name
@@ -45,56 +38,86 @@ module OneM2M_Pixits {
 			modulepar XSD.ID PX_CSE_ID := "/cseId";
 			
 			/**
-	 * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
+			 * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
 			 */			
-	modulepar XSD.ID PX_SP_ID					:= "//om2m.org";
+			modulepar XSD.ID PX_CSE_RESOURCE_ID	:= "cseResourceId";
 			 
 			/**
-	 * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+			 * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
 			 */
-	modulepar XSD.ID PX_CSE1_ID					:= "/MyCSEId";
+			modulepar XSD.ID PX_SP_ID := "//om2m.org";
 
 			/**
-	 * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+			 * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
 			 */	
-	modulepar XSD.ID PX_CSE_RESOURCE_ID			:= "cseResourceId";
+			modulepar XSD.ID PX_SUPER_AE_ID				:= "admin:admin";
 	
 			/**
-	 * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+			 * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
 			 */	
-	modulepar XSD.ID PX_AE1_ID_STEM				:= "";
+			modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";	
+			
+			modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+	
+			modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
+	
+			modulepar charstring PX_SERIALIZATION			:= "XML";
+	
+			modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";		
+			
+			modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
+			
+			modulepar ListOfURIs PX_ACOR 					:= {"*"};			
+		}
+		
+		group TesterParameters {
+		
+			modulepar charstring PX_AE1_ADDRESS				:= "127.0.0.1:3131";
+	
+			modulepar charstring PX_AE2_ADDRESS				:= "127.0.0.1:3132";
+	
+			modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
 	
 			/**
-	 * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+			 * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
 			 */		
-	modulepar XSD.ID PX_AE2_ID_STEM				:= "";
+			modulepar XSD.ID PX_CSE1_ID					:= "/MyCSEId";
 		
 			/**
-	 * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+			 * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
 			 */			
-	modulepar XSD.ID PX_SUPER_AE_ID				:= "admin:admin";
+			modulepar XSD.ID PX_AE1_ID_STEM				:= "";
 
 			/**
-	 * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+			 * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
 			 */		
-	modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";
+			modulepar XSD.ID PX_AE2_ID_STEM				:= "";
 			
 			/**
 			 * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
 			 */		
 			modulepar XSD.ID PX_APP_ID 					:= "NMyAppId";
 
+		}
+		
+		group ExecutionParameters {
+		
+			modulepar boolean PX_DELETE_CREATED_RESOURCES 	:= true;
+	
+			modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED 	:= "/ae_test";
+	
+			modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
+	
 			modulepar boolean PX_RUN_POSTAMBLE 				:= true;		
 		
-	modulepar ListOfURIs PX_ACOR 					:= {"*"};
 		
-	modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+		}
+
+
+	
 
-	modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
 	
-	modulepar charstring PX_SERIALIZATION			:= "XML";
 
-	modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";
 	
 	modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR 				:= true;
 	
@@ -102,6 +125,7 @@ module OneM2M_Pixits {
 	//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT  	
 	modulepar boolean PX_IUT_IS_ASN_CSE				:= false; //default //set it to true when running Device-based location testcases 	
 	modulepar boolean PX_IUT_IS_MN_CSE				:= false; //default //set it to true when running Share-based location testcases
+	modulepar boolean PX_IUT_IS_IN_CSE				:= false; //default //set it to true when running Share-based location testcases
 	
 	//constant parameters for LOC  
 	modulepar XSD.Token PX_LOCATION_TARGET_ID				:= "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER

LibOneM2M/OneM2M_Ports.ttcn

@@ -42,4 +42,14 @@ module OneM2M_Ports {
 			AcRequestPrimitive;
 	}
 	
+	/**
+	 * @desc Port to exchange information between components
+	 */
+	type port InfoPort message {
+		in
+			RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource;
+		out
+			RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource;
+	}
+
 }//end module

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -24,6 +24,7 @@ module OneM2M_TestSystem {
  */	
 	type component Tester {
 		port AdapterControlPort acPort;
+		port InfoPort infoPort;
 		//timers
 		timer tc_ac := PX_TAC;
 		timer tc_wait;
@@ -31,30 +32,48 @@ module OneM2M_TestSystem {
 		var Configurations vc_config;
 		var MyResourcesList vc_resourcesList;
 		var IntegerList vc_resourcesIndexToBeDeleted := {};
-		var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
-		var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
-	}
+		//var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
+		//var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
+		var integer vc_aeAuxIndex;//TODO To be removed
+		var integer vc_acpAuxIndex;
+		var AccessControlPolicy_optional vc_acpAux;
+	};
 	
-	type component CseTester extends Tester {
+	type component AeSimu extends Tester {
+		var AeSimu vc_ae2;
 		port OneM2MPort mcaPort;
-		port OneM2MPort mccPort;
+		port OneM2MPort mcaPortIn;
 	
 		//global variables
-		var integer vc_aeAuxIndex;//TODO To be removed
-		var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed
-		var AccessControlPolicy_optional vc_acpAux;
-		var integer vc_acpAuxIndex := -1;
+		var PrimitiveContent vc_primitiveContentRetrievedResource;
 
-	}
+		var MsgIn vc_request;
+		var MsgIn vc_response;
+		var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
+		var boolean vc_auxiliaryAe2Up := false;
+		//var AeSimu vc_ae2;
+	
+	};
 		
-	type component AeTester extends Tester {
+	type component CseSimu extends Tester {
 		port OneM2MPort mcaPort;
+		port OneM2MPort mccPort;
+		port OneM2MPort mccPortIn;
 
 		//global variables
-	}
+		var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
+		var integer vc_remoteCseIndex;
+		var MsgIn vc_request;
+		var MsgIn vc_response;
+	};
+	
+	type component InCseSimu extends CseSimu {}
+	
+	type component MnCseSimu extends CseSimu {}
 			
 	type component CseSystem {
 		port OneM2MPort mcaPort;
+		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
 		port AdapterControlPort acPort;
 	}	

LibOneM2M/OneM2M_Types.ttcn

@@ -3242,10 +3242,12 @@ module OneM2M_Types {
 //	TODO To be added
   type union Representation {
 	  Resource_2 resource, 
-	  ResponsePrimitive responsePrimitive
+	  ResponsePrimitive responsePrimitive, 
+	  XSD.AnyURI uRI
   }
   with {
   	variant "name as 'representation'";
+	variant (uRI) "name as capitalized";
   }
 
 	type record Notification_1
@@ -3618,12 +3620,12 @@ module OneM2M_Types {
 	};
 
 
-	type record ResourceWrapper
+	type record ResourceWrapper//Make of union elements type _optional
 	{
 		union {
-			AccessControlPolicy accessControlPolicy,
+			AccessControlPolicy_optional accessControlPolicy,
 			ActiveCmdhPolicy activeCmdhPolicy,
-			AE aE,
+			AE_optional aE,
 			AreaNwkDeviceInfo areaNwkDeviceInfo,
 			AreaNwkInfo areaNwkInfo,
 			Battery battery,
@@ -3635,36 +3637,36 @@ module OneM2M_Types {
 			CmdhNetworkAccessRules cmdhNetworkAccessRules,
 			CmdhNwAccessRule cmdhNwAccessRule,
 			CmdhPolicy cmdhPolicy,
-			Container container,
-			ContentInstance contentInstance,
-			CSEBase cSEBase,
-			Delivery delivery,
+			Container_optional container,
+			ContentInstance_optional contentInstance,
+			CSEBase_optional cSEBase,
+			Delivery_optional delivery,
 			DeviceCapability deviceCapability,
 			DeviceInfo deviceInfo,
 			EventConfig eventConfig,
 			EventLog eventLog,
 			ExecInstance execInstance,
 			Firmware firmware,
-			Group group_,
-			LocationPolicy locationPolicy,
-			M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
+			Group_optional group_,
+			LocationPolicy_optional locationPolicy,
+			M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
 			Memory memory,
-			MgmtCmd mgmtCmd,
-			Node node,
+			MgmtCmd_optional mgmtCmd,
+			Node_optional node,
 			Notification notification,
-			PollingChannel pollingChannel,
+			PollingChannel_optional pollingChannel,
 			Reboot reboot,
-			RemoteCSE remoteCSE,
-			Request request,
+			RemoteCSE_optional remoteCSE,
+			Request_optional request,
 			RequestPrimitive requestPrimitive,
 			ResponsePrimitive responsePrimitive,
-			Schedule schedule,
-			ServiceSubscribedAppRule serviceSubscribedAppRule,
-			ServiceSubscribedNode serviceSubscribedNode,
+			Schedule_optional schedule,
+			ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
+			ServiceSubscribedNode_optional serviceSubscribedNode,
 			Software software,
-			StatsCollect statsCollect,
-			StatsConfig statsConfig,
-			Subscription subscription
+			StatsCollect_optional statsCollect,
+			StatsConfig_optional statsConfig,
+			Subscription_optional subscription
 		} choice,
 		XSD.AnyURI uRI
 	}
@@ -5124,6 +5126,39 @@ group optionalResourceTypes {
 		  variant (choice.subscription_list[-]) "name as 'subscription'";
 		};
 		
+		type record ServiceSubscribedNode_optional
+		{
+			ResourceName resourceName optional,
+			ResourceType resourceType optional,
+			XSD.ID resourceID optional,
+			NhURI parentID optional,
+			Timestamp creationTime optional,
+			Timestamp lastModifiedTime optional,
+			Labels labels optional,
+			AcpType accessControlPolicyIDs optional,
+			Timestamp expirationTime optional,
+			NodeID nodeID optional,
+			XSD.ID cSE_ID optional,
+			record of DeviceID deviceIdentifier optional,
+			ListOfURIs ruleLinks optional,
+			union {
+				record length(1 .. infinity) of ChildResourceRef childResource_list,
+				record length(1 .. infinity) of Subscription subscription_list
+			} choice optional
+		}
+		with {
+		  variant "name as uncapitalized";
+		  variant "element";
+		  variant (resourceName) "attribute";
+		  variant (cSE_ID) "name as 'CSE-ID'";
+		  variant (deviceIdentifier) "list";
+		  variant (choice) "untagged";
+		  variant (choice.childResource_list) "untagged";
+		  variant (choice.childResource_list[-]) "name as 'childResource'";
+		  variant (choice.subscription_list) "untagged";
+		  variant (choice.subscription_list[-]) "name as 'subscription'";
+		};
+		
 		type record StatsCollect_optional
 		{
 			ResourceName resourceName optional,

LibOneM2M/XSD.ttcn

@@ -209,9 +209,9 @@ variant "XSD:double";
 
 // Time types
 
-type charstring Duration (pattern
-  "{dash}#(,1)P({nums}(Y({nums}(M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|" &
-  "{durTime}#(,1))|M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|{durTime})")
+type charstring Duration //(pattern TODO Check the pattern "PT5S" not matching
+  //"{dash}#(,1)P({nums}(Y({nums}(M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|" &
+  //"{durTime}#(,1))|M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|{durTime})")
 with {
 variant "XSD:duration";
 };

OneM2M_TestControl.ttcn

@@ -40,11 +40,12 @@ module OneM2M_TestControl {
 		execute(TC_CSE_REG_CRE_016_CST());
 		execute(TC_CSE_REG_CRE_016_POA());
 		execute(TC_CSE_REG_CRE_016_NL());
-		execute(TC_CSE_REG_CRE_018());
+		execute(TC_CSE_REG_CRE_019());
 		execute(TC_CSE_REG_CRE_022());
 		execute(TC_CSE_REG_CRE_023());
 		execute(TC_CSE_REG_CRE_025());
-		execute(TC_CSE_REG_CRE_026());
+		execute(TC_CSE_REG_CRE_028());
+		execute(TC_CSE_REG_CRE_029());
 		execute(TC_CSE_REG_RET_001());
 		execute(TC_CSE_REG_RET_005());
 		execute(TC_CSE_REG_RET_008());