Commited tests from contribution TST-2016-0253R03-TS-0018-Test_Purposes_contribution_REG

LibOneM2M/OneM2M_Templates.ttcn

@@ -397,14 +397,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for AE resource (AUX)
*/
//Added by @Naum
-			template RequestPrimitive mw_createAEannc(template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, XSD.ID p_appId) := {
+			template RequestPrimitive mw_createAEannc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := omit) := {
operation := int1,
-				to_ := ?,
+				to_ := p_to,
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := ?,
resourceType := int10002,
primitiveContent := {
-					any_1 := {{AEAnnc_optional := mw_contentCreateAEannc(c_aeAuxName, p_accessControlPolicyIds, p_appId)}}	
+					any_1 := {{AEAnnc_optional := mw_contentCreateAEannc("Credential-ID:None", p_accessControlPolicyIds, p_appId, p_to & "/" & p_stemId)}}	
},
roleIDs := *,
originatingTimestamp := *,
@@ -845,14 +845,14 @@ module OneM2M_Templates {
group ContentCreate {
-		template AEAnnc_optional mw_contentCreateAEannc (in template (omit)  XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID) := {
-    		resourceName := p_name,//O
+		template AEAnnc_optional mw_contentCreateAEannc (in template (omit)  XSD.String p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, XSD.AnyURI p_nodeLink := omit) := {
+    		resourceName := *,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
-    		labels := *,//O
+    		labels := p_labels,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
@@ -862,7 +862,7 @@ module OneM2M_Templates {
aE_ID := omit,//NP
pointOfAccess := *, //{"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := *,//O
-			nodeLink := omit,//NP
+			nodeLink := p_nodeLink,//NP
requestReachability := ?,//M
contentSerialization := *,//O
e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
@@ -2404,6 +2404,21 @@ module OneM2M_Templates {
assignedTokenIdentifiers := omit,
tokenRequestInformation := omit
};
+		
+		template ResponsePrimitive m_responsePrimitiveCreate(in template PrimitiveContent p_content := omit) := {
+			responseStatusCode := int2001,
+			requestIdentifier := testcasename() & "-m_responseNotification" & f_rnd(1, 1000000),,
+			primitiveContent := p_content,
+			to_ := omit,
+			from_ := omit,
+			originatingTimestamp := omit,
+			resultExpirationTimestamp := omit,
+			eventCategory := omit,
+			contentStatus := omit,
+			contentOffset := omit,
+			assignedTokenIdentifiers := omit,
+			tokenRequestInformation := omit
+    	};
}//end group ResponsePrimitives