diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 78370a9247ea0367c4e483c2986178041e6599ec..3138f585b33864616533fcda01e86aab701d6cc9 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ - * $Id: OneM2M_Functions.ttcn 292 2017-05-23 04:52:23Z reinaortega $ + * $Id: OneM2M_Functions.ttcn 296 2017-06-02 13:16:50Z reinaortega $ * @desc Module containing functions for oneM2M * */ @@ -175,8 +175,8 @@ module OneM2M_Functions { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass,__SCOPE__&":INFO: Application registered successfuly"); - if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional)) { - vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional; + if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE_optional)) { + vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE_optional; f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive); @@ -246,8 +246,8 @@ module OneM2M_Functions { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, __SCOPE__&": INFO: Application registered successfuly"); - if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional)) { - vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional; + if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE_optional)) { + vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE_optional; v_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent); vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_aeAuxIndex}; @@ -295,8 +295,8 @@ module OneM2M_Functions { if(p_resourceType == int23){ p_notifyHandler := CseTester.create("NotifyHandler") alive; p_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {"http://" & PX_AE2_ADDRESS & "/"}), -1); // AE2 is registred - if(ischosen(p_createRequestPrimitive.primitiveContent.any_1[0].Subscription_optional)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced - p_createRequestPrimitive.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(p_ae2Index)}; + if(ischosen(p_createRequestPrimitive.primitiveContent.subscription_optional)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced + p_createRequestPrimitive.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(p_ae2Index)}; } p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(p_aeIndex))); } @@ -326,8 +326,8 @@ module OneM2M_Functions { //For deletion of AEs, priority is to use AE-ID in From parameter //For other resources PX_SUPER_USER should be able to do DELETE operation if(PX_FROM_IS_AE_ID){ - if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.any_1[0].AE_optional)) { - v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.any_1[0].AE_optional.aE_ID; + if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE_optional)) { + v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE_optional.aE_ID; } } @@ -488,8 +488,8 @@ module OneM2M_Functions { v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_acpName := c_acpAuxName);//"MyAcp_2" v_request := valueof(m_createContainerBase); - v_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}; - v_request.primitiveContent.any_1[0].Container_optional.resourceName := "MyContainerAux"; + v_request.primitiveContent.container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}; + v_request.primitiveContent.container_optional.resourceName := "MyContainerAux"; v_containerResourceIndex := f_cse_createResource(int3, v_request, p_parentIndex); @@ -604,7 +604,7 @@ module OneM2M_Functions { v_request.to_ := f_getResourceAddress(vc_acpAuxIndex); v_request.from_ := f_getOriginator(vc_acpAuxIndex); - v_request.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := { + v_request.primitiveContent.accessControlPolicy_optional.privileges.accessControlRule_list := { { accessControlOriginators := PX_ACOR, //{"admin:admin"} accessControlOperations := valueof(p_allowedOperations), @@ -680,7 +680,7 @@ module OneM2M_Functions { map(self:mcaPort, system:mcaPort); map(self:acPort, system:acPort); - v_notificationResponse.any_1 := {{Notification := valueof(m_contentNotification_allOmit)}}; + v_notificationResponse := {notification := valueof(m_contentNotification_allOmit)}; v_notificationRequest.verificationRequest := true; //v_notificationRequest.creator := p_creator; TODO To check what address format is to be expected @@ -723,59 +723,59 @@ module OneM2M_Functions { function f_checkAttributesToBeSaved (ResourceType p_resourceType, RequestPrimitive p_request, inout ResponsePrimitive p_response) { select (p_resourceType) { case (int1) { - if(isvalue(p_response.primitiveContent.any_1[0].AccessControlPolicy_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName))) { - p_response.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName := p_request.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName) + if(isvalue(p_response.primitiveContent.accessControlPolicy_optional) and + not(ispresent(p_response.primitiveContent.accessControlPolicy_optional.resourceName))) { + p_response.primitiveContent.accessControlPolicy_optional.resourceName := p_request.primitiveContent.accessControlPolicy_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.accessControlPolicy_optional.resourceName) } } case (int2) { - if(isvalue(p_response.primitiveContent.any_1[0].AE_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].AE_optional.resourceName))) { - p_response.primitiveContent.any_1[0].AE_optional.resourceName := p_request.primitiveContent.any_1[0].AE_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].AE_optional.resourceName) + if(isvalue(p_response.primitiveContent.aE_optional) and + not(ispresent(p_response.primitiveContent.aE_optional.resourceName))) { + p_response.primitiveContent.aE_optional.resourceName := p_request.primitiveContent.aE_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.aE_optional.resourceName) } } case (int3) { - if(isvalue(p_response.primitiveContent.any_1[0].Container_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].Container_optional.resourceName))) { - p_response.primitiveContent.any_1[0].Container_optional.resourceName := p_request.primitiveContent.any_1[0].Container_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].Container_optional.resourceName) + if(isvalue(p_response.primitiveContent.container_optional) and + not(ispresent(p_response.primitiveContent.container_optional.resourceName))) { + p_response.primitiveContent.container_optional.resourceName := p_request.primitiveContent.container_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.container_optional.resourceName) } } case (int4) { - if(isvalue(p_response.primitiveContent.any_1[0].ContentInstance_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].ContentInstance_optional.resourceName))) { - p_response.primitiveContent.any_1[0].ContentInstance_optional.resourceName := p_request.primitiveContent.any_1[0].ContentInstance_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].ContentInstance_optional.resourceName) + if(isvalue(p_response.primitiveContent.contentInstance_optional) and + not(ispresent(p_response.primitiveContent.contentInstance_optional.resourceName))) { + p_response.primitiveContent.contentInstance_optional.resourceName := p_request.primitiveContent.contentInstance_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.contentInstance_optional.resourceName) } } case (int15) { - if (isvalue(p_response.primitiveContent.any_1[0].PollingChannel_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].PollingChannel_optional.resourceName))) { - p_response.primitiveContent.any_1[0].PollingChannel_optional.resourceName := p_request.primitiveContent.any_1[0].PollingChannel_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].PollingChannel_optional.resourceName) + if (isvalue(p_response.primitiveContent.pollingChannel_optional) and + not(ispresent(p_response.primitiveContent.pollingChannel_optional.resourceName))) { + p_response.primitiveContent.pollingChannel_optional.resourceName := p_request.primitiveContent.pollingChannel_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.pollingChannel_optional.resourceName) } } case (int18) { - if (isvalue(p_response.primitiveContent.any_1[0].Schedule_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].Schedule_optional.resourceName))) { - p_response.primitiveContent.any_1[0].Schedule_optional.resourceName := p_request.primitiveContent.any_1[0].Schedule_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].Schedule_optional.resourceName) + if (isvalue(p_response.primitiveContent.schedule_optional) and + not(ispresent(p_response.primitiveContent.schedule_optional.resourceName))) { + p_response.primitiveContent.schedule_optional.resourceName := p_request.primitiveContent.schedule_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.schedule_optional.resourceName) } } case (int23) { - if (isvalue(p_response.primitiveContent.any_1[0].Subscription_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].Subscription_optional.resourceName))) { - p_response.primitiveContent.any_1[0].Subscription_optional.resourceName := p_request.primitiveContent.any_1[0].Subscription_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].Subscription_optional.resourceName) + if (isvalue(p_response.primitiveContent.subscription_optional) and + not(ispresent(p_response.primitiveContent.subscription_optional.resourceName))) { + p_response.primitiveContent.subscription_optional.resourceName := p_request.primitiveContent.subscription_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription_optional.resourceName) } } case (int9) { - if (isvalue(p_response.primitiveContent.any_1[0].Group_optional) and - not(ispresent(p_response.primitiveContent.any_1[0].Group_optional.resourceName))) { - p_response.primitiveContent.any_1[0].Group_optional.resourceName := p_request.primitiveContent.any_1[0].Group_optional.resourceName; - log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.any_1[0].Group_optional.resourceName) + if (isvalue(p_response.primitiveContent.group_optional) and + not(ispresent(p_response.primitiveContent.group_optional.resourceName))) { + p_response.primitiveContent.group_optional.resourceName := p_request.primitiveContent.group_optional.resourceName; + log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_optional.resourceName) } } case else { @@ -792,24 +792,24 @@ module OneM2M_Functions { var integer i; var integer v_numberOfAggregatedNotification; - if (ischosen(p_primitiveContent.any_1[0].AE_optional)){ - if(ischosen(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.resource)) { - v_matchResult := match(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.resource.AE_optional, p_primitiveContent.any_1[0].AE_optional) + if (ischosen(p_primitiveContent.aE_optional)){ + if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource)) { + v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.AE_optional, p_primitiveContent.aE_optional) } - else if(ischosen(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.responsePrimitive)) { - v_matchResult :=match(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.responsePrimitive.primitiveContent.any_1[0].AE_optional, p_primitiveContent.any_1[0].AE_optional) + else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) { + v_matchResult :=match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE_optional, p_primitiveContent.aE_optional) } - else if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].AggregatedNotification)) { + else if (ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification)) { v_matchResult := true; - v_numberOfAggregatedNotification := lengthof(p_requestPrimitive.primitiveContent.any_1[0].AggregatedNotification.notification_list); + v_numberOfAggregatedNotification := lengthof(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list); for(i := 0; i< v_numberOfAggregatedNotification; i := i + 1){ - if(ischosen(p_requestPrimitive.primitiveContent.any_1[0].AggregatedNotification.notification_list[i].notificationEvent.representation.resource)) { - if(not (match(p_requestPrimitive.primitiveContent.any_1[0].AggregatedNotification.notification_list[i].notificationEvent.representation.resource.AE_optional, p_primitiveContent.any_1[0].AE_optional))){ + if(ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource)) { + if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource.AE_optional, p_primitiveContent.aE_optional))){ v_matchResult := false; } } - else if(ischosen(p_requestPrimitive.primitiveContent.any_1[0].AggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive)) { - if(not (match(p_requestPrimitive.primitiveContent.any_1[0].AggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.any_1[0].AE_optional, p_primitiveContent.any_1[0].AE_optional))){ + else if(ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive)) { + if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.aE_optional, p_primitiveContent.aE_optional))){ v_matchResult := false; } } @@ -821,12 +821,12 @@ module OneM2M_Functions { } - if (ischosen(p_primitiveContent.any_1[0].Container_optional)){ - if(ischosen(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.resource)) { - v_matchResult := match(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.resource.Container_optional, p_primitiveContent.any_1[0].Container_optional) + if (ischosen(p_primitiveContent.container_optional)){ + if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource)) { + v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.Container_optional, p_primitiveContent.container_optional) } - else if(ischosen(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.responsePrimitive)) { - v_matchResult := match(p_requestPrimitive.primitiveContent.any_1[0].Notification.notificationEvent.representation.responsePrimitive.primitiveContent.any_1[0].Container_optional, p_primitiveContent.any_1[0].Container_optional) + else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) { + v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container_optional, p_primitiveContent.container_optional) } } @@ -915,7 +915,7 @@ module OneM2M_Functions { function f_ae_preamble_registerAe() runs on AeTester return integer { var MsgIn v_request; - var Contents[-] v_modifiedResource; + var PrimitiveContent v_modifiedResource; var integer v_resourceIndex, v_parentIndex; var RequestPrimitive v_rp; @@ -928,7 +928,7 @@ module OneM2M_Functions { v_parentIndex := f_getResourceIndex(v_rp.to_); v_resourceIndex := f_ae_createResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType, v_modifiedResource); if(v_resourceIndex != -1) { - mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, {any_1 := {v_modifiedResource}}))); + mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))); setverdict(pass, __SCOPE__&":INFO: Application registered successfuly"); } else { @@ -960,14 +960,14 @@ module OneM2M_Functions { * @param p_modifiedResource Assigned and/or modified fields * @return Internal resource index of the saved resource or -1 */ - function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out Contents[-] p_modifiedResource) runs on AeTester return integer { + function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on AeTester return integer { var integer v_resourceIndex; // AE TODO To review the code (use of indexes, generation of value for certain attributes, etc..) if(p_resourceType == int2 and ispresent(p_resource)) { - if(ischosen(p_resource.any_1[0].AE_optional)){ - var AE_optional v_ae := p_resource.any_1[0].AE_optional; + if(ischosen(p_resource.aE_optional)){ + var AE_optional v_ae := p_resource.aE_optional; var AE_optional v_aeModified; v_resourceIndex := lengthof(vc_resourcesList) - 1; @@ -987,8 +987,8 @@ module OneM2M_Functions { v_aeModified.aE_ID := v_ae.aE_ID; v_aeModified.resourceName := v_ae.resourceName; - p_resource.any_1[0].AE_optional := v_ae; - p_modifiedResource.AE_optional := v_aeModified; + p_resource.aE_optional := v_ae; + p_modifiedResource.aE_optional := v_aeModified; return f_setResource(p_resource, p_parentIndex); } @@ -1032,7 +1032,7 @@ module OneM2M_Functions { altstep a_ae_cf03() runs on AeTester { var MsgIn v_request; - var Contents[-] v_modifiedResource; + var PrimitiveContent v_modifiedResource; var integer v_resourceIndex, v_parentIndex; var RequestPrimitive v_rp; @@ -1041,7 +1041,7 @@ module OneM2M_Functions { v_parentIndex := f_getResourceIndex(v_rp.to_); v_resourceIndex := f_ae_createResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType, v_modifiedResource); if(v_resourceIndex != -1) { - mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, {any_1 := {v_modifiedResource}}))); + mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))); } else { mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))); @@ -1081,26 +1081,26 @@ module OneM2M_Functions { } if (p_resourceType == int9) {//group - if(match(valueof(p_request.primitiveContent.any_1[0].Group_optional.memberIDs), v_defaultListOfURIs )){ - p_request.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceAddress(p_parentIndex)}; + if(match(valueof(p_request.primitiveContent.group_optional.memberIDs), v_defaultListOfURIs )){ + p_request.primitiveContent.group_optional.memberIDs := {f_getResourceAddress(p_parentIndex)}; } } if(p_resourceType == int3){//container //when a container is created by hosting cse for storing location information, the container is seen as a location container if(PX_IS_LOC_CONTAINER){ - p_request.primitiveContent.any_1[0].Container_optional.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy + p_request.primitiveContent.container_optional.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy } - if(ispresent(p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs)) { - if(match(valueof(p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs), v_defaultAcpIDs )){ - p_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}; + if(ispresent(p_request.primitiveContent.container_optional.accessControlPolicyIDs)) { + if(match(valueof(p_request.primitiveContent.container_optional.accessControlPolicyIDs), v_defaultAcpIDs )){ + p_request.primitiveContent.container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}; } } } if (p_resourceType == int15) {//pollingChannel - if(ischosen(vc_resourcesList[p_parentIndex].resource.any_1[0].AE_optional)) { - p_request.from_ := vc_resourcesList[p_parentIndex].resource.any_1[0].AE_optional.aE_ID; + if(ischosen(vc_resourcesList[p_parentIndex].resource.aE_optional)) { + p_request.from_ := vc_resourcesList[p_parentIndex].resource.aE_optional.aE_ID; } } @@ -1109,24 +1109,24 @@ module OneM2M_Functions { if (p_resourceType == int23) {//subscription //notificationURI - if(match(valueof(p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI), v_defaultListOfURIs )){ - p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(p_parentIndex)}; + if(match(valueof(p_request.primitiveContent.subscription_optional.notificationURI), v_defaultListOfURIs )){ + p_request.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(p_parentIndex)}; } //creator attribute - if(ispresent(p_request.primitiveContent.any_1[0].Subscription_optional.creator)) { - p_request.primitiveContent.any_1[0].Subscription_optional.creator := f_getCreator(p_parentIndex); + if(ispresent(p_request.primitiveContent.subscription_optional.creator)) { + p_request.primitiveContent.subscription_optional.creator := f_getCreator(p_parentIndex); } //accessControlPolicyIds - if(ispresent(p_request.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs)) { - if(match(valueof(p_request.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs), v_defaultAcpIDs )){ - p_request.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}; + if(ispresent(p_request.primitiveContent.subscription_optional.accessControlPolicyIDs)) { + if(match(valueof(p_request.primitiveContent.subscription_optional.accessControlPolicyIDs), v_defaultAcpIDs )){ + p_request.primitiveContent.subscription_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}; } } } if (p_resourceType == int4) {//contentInstance //creator attribute - if(ispresent(p_request.primitiveContent.any_1[0].ContentInstance_optional.creator)) { - p_request.primitiveContent.any_1[0].ContentInstance_optional.creator := f_getCreator(p_parentIndex); + if(ispresent(p_request.primitiveContent.contentInstance_optional.creator)) { + p_request.primitiveContent.contentInstance_optional.creator := f_getCreator(p_parentIndex); } } @@ -1224,32 +1224,32 @@ module OneM2M_Functions { */ function f_getResourceId(PrimitiveContent p_contentResource) return XSD.ID { - if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].AccessControlPolicy_optional.resourceID); + if(ischosen(p_contentResource.accessControlPolicy_optional)) { + return f_resourceIdCleaner(p_contentResource.accessControlPolicy_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].Container_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].Container_optional.resourceID); + if(ischosen(p_contentResource.container_optional)) { + return f_resourceIdCleaner(p_contentResource.container_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].ContentInstance_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].ContentInstance_optional.resourceID); + if(ischosen(p_contentResource.contentInstance_optional)) { + return f_resourceIdCleaner(p_contentResource.contentInstance_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].Schedule_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].Schedule_optional.resourceID); + if(ischosen(p_contentResource.schedule_optional)) { + return f_resourceIdCleaner(p_contentResource.schedule_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].PollingChannel_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].PollingChannel_optional.resourceID); + if(ischosen(p_contentResource.pollingChannel_optional)) { + return f_resourceIdCleaner(p_contentResource.pollingChannel_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].Subscription_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].Subscription_optional.resourceID); + if(ischosen(p_contentResource.subscription_optional)) { + return f_resourceIdCleaner(p_contentResource.subscription_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].Group_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].Group_optional.resourceID); + if(ischosen(p_contentResource.group_optional)) { + return f_resourceIdCleaner(p_contentResource.group_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].AE_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].AE_optional.resourceID); + if(ischosen(p_contentResource.aE_optional)) { + return f_resourceIdCleaner(p_contentResource.aE_optional.resourceID); } - if(ischosen(p_contentResource.any_1[0].ServiceSubscribedAppRule_optional)) { - return f_resourceIdCleaner(p_contentResource.any_1[0].ServiceSubscribedAppRule_optional.resourceID); + if(ischosen(p_contentResource.serviceSubscribedAppRule_optional)) { + return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule_optional.resourceID); } log(""&__SCOPE__&":WARNING: Primitive Content Kind not implemented"); @@ -1265,32 +1265,32 @@ module OneM2M_Functions { */ function f_getResourceName(PrimitiveContent p_contentResource) return XSD.ID { - if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) { - return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceName; + if(ischosen(p_contentResource.accessControlPolicy_optional)) { + return p_contentResource.accessControlPolicy_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].Container_optional)) { - return p_contentResource.any_1[0].Container_optional.resourceName; + if(ischosen(p_contentResource.container_optional)) { + return p_contentResource.container_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].ContentInstance_optional)) { - return p_contentResource.any_1[0].ContentInstance_optional.resourceName; + if(ischosen(p_contentResource.contentInstance_optional)) { + return p_contentResource.contentInstance_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].Schedule_optional)) { - return p_contentResource.any_1[0].Schedule_optional.resourceName; + if(ischosen(p_contentResource.schedule_optional)) { + return p_contentResource.schedule_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].PollingChannel_optional)) { - return p_contentResource.any_1[0].PollingChannel_optional.resourceName; + if(ischosen(p_contentResource.pollingChannel_optional)) { + return p_contentResource.pollingChannel_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].Subscription_optional)) { - return p_contentResource.any_1[0].Subscription_optional.resourceName; + if(ischosen(p_contentResource.subscription_optional)) { + return p_contentResource.subscription_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].Group_optional)) { - return p_contentResource.any_1[0].Group_optional.resourceName; + if(ischosen(p_contentResource.group_optional)) { + return p_contentResource.group_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].AE_optional)) { - return p_contentResource.any_1[0].AE_optional.resourceName; + if(ischosen(p_contentResource.aE_optional)) { + return p_contentResource.aE_optional.resourceName; } - if(ischosen(p_contentResource.any_1[0].ServiceSubscribedAppRule_optional)) { - return p_contentResource.any_1[0].ServiceSubscribedAppRule_optional.resourceName; + if(ischosen(p_contentResource.serviceSubscribedAppRule_optional)) { + return p_contentResource.serviceSubscribedAppRule_optional.resourceName; } log(__SCOPE__&":WARNING: Primitive Content Kind not implemented"); @@ -1311,8 +1311,8 @@ module OneM2M_Functions { } if(PX_FROM_IS_AE_ID) { - if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional)) { - return vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional.aE_ID; + if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE_optional)) { + return vc_resourcesList[p_targetResourceIndex].resource.aE_optional.aE_ID; } else { return f_getOriginator(vc_resourcesList[p_targetResourceIndex].parentIndex); } @@ -1333,8 +1333,8 @@ module OneM2M_Functions { return PX_CSE_ID; } - if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional)) { - return vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional.aE_ID; + if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE_optional)) { + return vc_resourcesList[p_targetResourceIndex].resource.aE_optional.aE_ID; } else { return f_getCreator(vc_resourcesList[p_targetResourceIndex].parentIndex); } @@ -1481,23 +1481,23 @@ module OneM2M_Functions { */ function f_setAcpId(template RequestPrimitive p_requestPrimitive, template AcpType p_accessControlPolicyIDs) runs on CseTester return RequestPrimitive{ - if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].AE_optional)){ - p_requestPrimitive.primitiveContent.any_1[0].AE_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; + if (ischosen(p_requestPrimitive.primitiveContent.aE_optional)){ + p_requestPrimitive.primitiveContent.aE_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; } - else if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].Container_optional)){ - p_requestPrimitive.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; + else if (ischosen(p_requestPrimitive.primitiveContent.container_optional)){ + p_requestPrimitive.primitiveContent.container_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; } - else if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].Group_optional)){ - p_requestPrimitive.primitiveContent.any_1[0].Group_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; + else if (ischosen(p_requestPrimitive.primitiveContent.group_optional)){ + p_requestPrimitive.primitiveContent.group_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; } - else if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].ServiceSubscribedAppRule_optional)){ - p_requestPrimitive.primitiveContent.any_1[0].ServiceSubscribedAppRule_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; + else if (ischosen(p_requestPrimitive.primitiveContent.serviceSubscribedAppRule_optional)){ + p_requestPrimitive.primitiveContent.serviceSubscribedAppRule_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; } - else if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].Subscription_optional)){ - p_requestPrimitive.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; + else if (ischosen(p_requestPrimitive.primitiveContent.subscription_optional)){ + p_requestPrimitive.primitiveContent.subscription_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; } - else if (ischosen(p_requestPrimitive.primitiveContent.any_1[0].LocationPolicy_optional)){ - p_requestPrimitive.primitiveContent.any_1[0].LocationPolicy_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; + else if (ischosen(p_requestPrimitive.primitiveContent.locationPolicy_optional)){ + p_requestPrimitive.primitiveContent.locationPolicy_optional.accessControlPolicyIDs := p_accessControlPolicyIDs; } return valueof(p_requestPrimitive); } @@ -1509,8 +1509,8 @@ module OneM2M_Functions { */ function f_getAeId(integer p_targetResourceIndex := -1) runs on AeTester return XSD.ID { - if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional)) { - return vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional.aE_ID; + if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE_optional)) { + return vc_resourcesList[p_targetResourceIndex].resource.aE_optional.aE_ID; } log("f_getAeId: WARNING: p_targetResourceIndex does not refer to AE resource"); @@ -1616,232 +1616,232 @@ module OneM2M_Functions { function f_getTemplateFromPrimitiveContent (in template PrimitiveContent p_primitiveContent) return template PrimitiveContent{ var template PrimitiveContent v_primitiveContent := omit; - if(ischosen(p_primitiveContent.any_1[0].Container_optional)){ // Container - v_primitiveContent.any_1 := {{Container_optional := mw_contentContainerBase}}; + if(ischosen(p_primitiveContent.container_optional)){ // Container + v_primitiveContent := {container_optional := mw_contentContainerBase}; - if(ispresent(p_primitiveContent.any_1[0].Container_optional.labels)){ - v_primitiveContent.any_1[0].Container_optional.labels := ?; + if(ispresent(p_primitiveContent.container_optional.labels)){ + v_primitiveContent.container_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs)){ - v_primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := ?; + if(ispresent(p_primitiveContent.container_optional.accessControlPolicyIDs)){ + v_primitiveContent.container_optional.accessControlPolicyIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.dynamicAuthorizationConsultationIDs)){ - v_primitiveContent.any_1[0].Container_optional.dynamicAuthorizationConsultationIDs := ?; + if(ispresent(p_primitiveContent.container_optional.dynamicAuthorizationConsultationIDs)){ + v_primitiveContent.container_optional.dynamicAuthorizationConsultationIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.announceTo)){ - v_primitiveContent.any_1[0].Container_optional.announceTo := ?; + if(ispresent(p_primitiveContent.container_optional.announceTo)){ + v_primitiveContent.container_optional.announceTo := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.announcedAttribute)){ - v_primitiveContent.any_1[0].Container_optional.announcedAttribute := ?; + if(ispresent(p_primitiveContent.container_optional.announcedAttribute)){ + v_primitiveContent.container_optional.announcedAttribute := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.creator)){ - v_primitiveContent.any_1[0].Container_optional.creator := ?; + if(ispresent(p_primitiveContent.container_optional.creator)){ + v_primitiveContent.container_optional.creator := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.maxNrOfInstances)){ - v_primitiveContent.any_1[0].Container_optional.maxNrOfInstances := ?; + if(ispresent(p_primitiveContent.container_optional.maxNrOfInstances)){ + v_primitiveContent.container_optional.maxNrOfInstances := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.maxByteSize)){ - v_primitiveContent.any_1[0].Container_optional.maxByteSize := ?; + if(ispresent(p_primitiveContent.container_optional.maxByteSize)){ + v_primitiveContent.container_optional.maxByteSize := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.maxInstanceAge)){ - v_primitiveContent.any_1[0].Container_optional.maxInstanceAge := ?; + if(ispresent(p_primitiveContent.container_optional.maxInstanceAge)){ + v_primitiveContent.container_optional.maxInstanceAge := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.locationID)){ - v_primitiveContent.any_1[0].Container_optional.locationID := ?; + if(ispresent(p_primitiveContent.container_optional.locationID)){ + v_primitiveContent.container_optional.locationID := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.ontologyRef)){ - v_primitiveContent.any_1[0].Container_optional.ontologyRef := ?; + if(ispresent(p_primitiveContent.container_optional.ontologyRef)){ + v_primitiveContent.container_optional.ontologyRef := ?; } - if(ispresent(p_primitiveContent.any_1[0].Container_optional.disableRetrieval)){ - v_primitiveContent.any_1[0].Container_optional.disableRetrieval := ?; + if(ispresent(p_primitiveContent.container_optional.disableRetrieval)){ + v_primitiveContent.container_optional.disableRetrieval := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].AE_optional)){ // AE - v_primitiveContent.any_1 := {{AE_optional := mw_contentAeBase}}; + else if(ischosen(p_primitiveContent.aE_optional)){ // AE + v_primitiveContent := {aE_optional := mw_contentAeBase}; - if(ispresent(p_primitiveContent.any_1[0].AE_optional.labels)){ - v_primitiveContent.any_1[0].AE_optional.labels := ?; + if(ispresent(p_primitiveContent.aE_optional.labels)){ + v_primitiveContent.aE_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.accessControlPolicyIDs)){ - v_primitiveContent.any_1[0].AE_optional.accessControlPolicyIDs := ?; + if(ispresent(p_primitiveContent.aE_optional.accessControlPolicyIDs)){ + v_primitiveContent.aE_optional.accessControlPolicyIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.dynamicAuthorizationConsultationIDs)){ - v_primitiveContent.any_1[0].AE_optional.dynamicAuthorizationConsultationIDs := ?; + if(ispresent(p_primitiveContent.aE_optional.dynamicAuthorizationConsultationIDs)){ + v_primitiveContent.aE_optional.dynamicAuthorizationConsultationIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.announceTo)){ - v_primitiveContent.any_1[0].AE_optional.announceTo := ?; + if(ispresent(p_primitiveContent.aE_optional.announceTo)){ + v_primitiveContent.aE_optional.announceTo := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.announcedAttribute)){ - v_primitiveContent.any_1[0].AE_optional.announcedAttribute := ?; + if(ispresent(p_primitiveContent.aE_optional.announcedAttribute)){ + v_primitiveContent.aE_optional.announcedAttribute := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.appName)){ - v_primitiveContent.any_1[0].AE_optional.appName := ?; + if(ispresent(p_primitiveContent.aE_optional.appName)){ + v_primitiveContent.aE_optional.appName := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.pointOfAccess)){ - v_primitiveContent.any_1[0].AE_optional.pointOfAccess := ?; + if(ispresent(p_primitiveContent.aE_optional.pointOfAccess)){ + v_primitiveContent.aE_optional.pointOfAccess := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.ontologyRef)){ - v_primitiveContent.any_1[0].AE_optional.ontologyRef := ?; + if(ispresent(p_primitiveContent.aE_optional.ontologyRef)){ + v_primitiveContent.aE_optional.ontologyRef := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.nodeLink)){ - v_primitiveContent.any_1[0].AE_optional.nodeLink := ?; + if(ispresent(p_primitiveContent.aE_optional.nodeLink)){ + v_primitiveContent.aE_optional.nodeLink := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.contentSerialization)){ - v_primitiveContent.any_1[0].AE_optional.contentSerialization := ?; + if(ispresent(p_primitiveContent.aE_optional.contentSerialization)){ + v_primitiveContent.aE_optional.contentSerialization := ?; } - if(ispresent(p_primitiveContent.any_1[0].AE_optional.e2eSecInfo)){ - v_primitiveContent.any_1[0].AE_optional.e2eSecInfo := ?; + if(ispresent(p_primitiveContent.aE_optional.e2eSecInfo)){ + v_primitiveContent.aE_optional.e2eSecInfo := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].AccessControlPolicy_optional)){ // ACP - v_primitiveContent.any_1 := {{AccessControlPolicy_optional := mw_contentAcpBase}}; + else if(ischosen(p_primitiveContent.accessControlPolicy_optional)){ // ACP + v_primitiveContent := {accessControlPolicy_optional := mw_contentAcpBase}; - if(ispresent(p_primitiveContent.any_1[0].AccessControlPolicy_optional.labels)){ - v_primitiveContent.any_1[0].AccessControlPolicy_optional.labels := ?; + if(ispresent(p_primitiveContent.accessControlPolicy_optional.labels)){ + v_primitiveContent.accessControlPolicy_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo)){ - v_primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo := ?; + if(ispresent(p_primitiveContent.accessControlPolicy_optional.announceTo)){ + v_primitiveContent.accessControlPolicy_optional.announceTo := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].ContentInstance_optional)){ // ContentInstance - v_primitiveContent.any_1 := {{ContentInstance_optional := mw_contentContentInstanceBase}}; + else if(ischosen(p_primitiveContent.contentInstance_optional)){ // ContentInstance + v_primitiveContent := {contentInstance_optional := mw_contentContentInstanceBase}; - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.labels)){ - v_primitiveContent.any_1[0].ContentInstance_optional.labels := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.labels)){ + v_primitiveContent.contentInstance_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.announceTo)){ - v_primitiveContent.any_1[0].ContentInstance_optional.announceTo := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.announceTo)){ + v_primitiveContent.contentInstance_optional.announceTo := ?; } - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.announcedAttribute)){ - v_primitiveContent.any_1[0].ContentInstance_optional.announcedAttribute := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.announcedAttribute)){ + v_primitiveContent.contentInstance_optional.announcedAttribute := ?; } - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.creator)){ - v_primitiveContent.any_1[0].ContentInstance_optional.creator := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.creator)){ + v_primitiveContent.contentInstance_optional.creator := ?; } - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.contentInfo)){ - v_primitiveContent.any_1[0].ContentInstance_optional.contentInfo := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.contentInfo)){ + v_primitiveContent.contentInstance_optional.contentInfo := ?; } - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.contentRef)){ - v_primitiveContent.any_1[0].ContentInstance_optional.contentRef := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.contentRef)){ + v_primitiveContent.contentInstance_optional.contentRef := ?; } - if(ispresent(p_primitiveContent.any_1[0].ContentInstance_optional.ontologyRef)){ - v_primitiveContent.any_1[0].ContentInstance_optional.ontologyRef := ?; + if(ispresent(p_primitiveContent.contentInstance_optional.ontologyRef)){ + v_primitiveContent.contentInstance_optional.ontologyRef := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].Group_optional)){ // Group - v_primitiveContent.any_1 := {{Group_optional := mw_contentGroupBase}}; + else if(ischosen(p_primitiveContent.group_optional)){ // Group + v_primitiveContent := {group_optional := mw_contentGroupBase}; - if(ispresent(p_primitiveContent.any_1[0].Group_optional.labels)){ - v_primitiveContent.any_1[0].Group_optional.labels := ?; + if(ispresent(p_primitiveContent.group_optional.labels)){ + v_primitiveContent.group_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.accessControlPolicyIDs)){ - v_primitiveContent.any_1[0].Group_optional.accessControlPolicyIDs := ?; + if(ispresent(p_primitiveContent.group_optional.accessControlPolicyIDs)){ + v_primitiveContent.group_optional.accessControlPolicyIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.dynamicAuthorizationConsultationIDs)){ - v_primitiveContent.any_1[0].Group_optional.dynamicAuthorizationConsultationIDs := ?; + if(ispresent(p_primitiveContent.group_optional.dynamicAuthorizationConsultationIDs)){ + v_primitiveContent.group_optional.dynamicAuthorizationConsultationIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.announceTo)){ - v_primitiveContent.any_1[0].Group_optional.announceTo := ?; + if(ispresent(p_primitiveContent.group_optional.announceTo)){ + v_primitiveContent.group_optional.announceTo := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.announcedAttribute)){ - v_primitiveContent.any_1[0].Group_optional.announcedAttribute := ?; + if(ispresent(p_primitiveContent.group_optional.announcedAttribute)){ + v_primitiveContent.group_optional.announcedAttribute := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.creator)){ - v_primitiveContent.any_1[0].Group_optional.creator := ?; + if(ispresent(p_primitiveContent.group_optional.creator)){ + v_primitiveContent.group_optional.creator := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.membersAccessControlPolicyIDs)){ - v_primitiveContent.any_1[0].Group_optional.membersAccessControlPolicyIDs := ?; + if(ispresent(p_primitiveContent.group_optional.membersAccessControlPolicyIDs)){ + v_primitiveContent.group_optional.membersAccessControlPolicyIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ - v_primitiveContent.any_1[0].Group_optional.memberTypeValidated := ?; + if(ispresent(p_primitiveContent.group_optional.memberTypeValidated)){ + v_primitiveContent.group_optional.memberTypeValidated := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.consistencyStrategy)){ - v_primitiveContent.any_1[0].Group_optional.consistencyStrategy := ?; + if(ispresent(p_primitiveContent.group_optional.consistencyStrategy)){ + v_primitiveContent.group_optional.consistencyStrategy := ?; } - if(ispresent(p_primitiveContent.any_1[0].Group_optional.groupName)){ - v_primitiveContent.any_1[0].Group_optional.groupName := ?; + if(ispresent(p_primitiveContent.group_optional.groupName)){ + v_primitiveContent.group_optional.groupName := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].PollingChannel_optional)){ // PollingChannel - v_primitiveContent.any_1 := {{PollingChannel_optional := mw_contentPollingChannelBase}}; + else if(ischosen(p_primitiveContent.pollingChannel_optional)){ // PollingChannel + v_primitiveContent := {pollingChannel_optional := mw_contentPollingChannelBase}; - if(ispresent(p_primitiveContent.any_1[0].PollingChannel_optional.labels)){ - v_primitiveContent.any_1[0].PollingChannel_optional.labels := ?; + if(ispresent(p_primitiveContent.pollingChannel_optional.labels)){ + v_primitiveContent.pollingChannel_optional.labels := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].Schedule_optional)){ // Schedule - v_primitiveContent.any_1 := {{Schedule_optional := mw_contentScheduleBase}}; + else if(ischosen(p_primitiveContent.schedule_optional)){ // Schedule + v_primitiveContent := {schedule_optional := mw_contentScheduleBase}; - if(ispresent(p_primitiveContent.any_1[0].Schedule_optional.labels)){ - v_primitiveContent.any_1[0].Schedule_optional.labels := ?; + if(ispresent(p_primitiveContent.schedule_optional.labels)){ + v_primitiveContent.schedule_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].Schedule_optional.announceTo)){ - v_primitiveContent.any_1[0].Schedule_optional.announceTo := ?; + if(ispresent(p_primitiveContent.schedule_optional.announceTo)){ + v_primitiveContent.schedule_optional.announceTo := ?; } - if(ispresent(p_primitiveContent.any_1[0].Schedule_optional.announcedAttribute)){ - v_primitiveContent.any_1[0].Schedule_optional.announcedAttribute := ?; + if(ispresent(p_primitiveContent.schedule_optional.announcedAttribute)){ + v_primitiveContent.schedule_optional.announcedAttribute := ?; } } - else if(ischosen(p_primitiveContent.any_1[0].Subscription_optional)){ // Schedule - v_primitiveContent.any_1 := {{Subscription_optional := mw_contentSubscriptionBase}}; + else if(ischosen(p_primitiveContent.subscription_optional)){ // Schedule + v_primitiveContent := {subscription_optional := mw_contentSubscriptionBase}; - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.labels)){ - v_primitiveContent.any_1[0].Subscription_optional.labels := ?; + if(ispresent(p_primitiveContent.subscription_optional.labels)){ + v_primitiveContent.subscription_optional.labels := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs)){ - v_primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := ?; + if(ispresent(p_primitiveContent.subscription_optional.accessControlPolicyIDs)){ + v_primitiveContent.subscription_optional.accessControlPolicyIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.dynamicAuthorizationConsultationIDs)){ - v_primitiveContent.any_1[0].Subscription_optional.dynamicAuthorizationConsultationIDs := ?; + if(ispresent(p_primitiveContent.subscription_optional.dynamicAuthorizationConsultationIDs)){ + v_primitiveContent.subscription_optional.dynamicAuthorizationConsultationIDs := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.creator)){ - v_primitiveContent.any_1[0].Subscription_optional.creator := ?; + if(ispresent(p_primitiveContent.subscription_optional.creator)){ + v_primitiveContent.subscription_optional.creator := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.eventNotificationCriteria)){ - v_primitiveContent.any_1[0].Subscription_optional.eventNotificationCriteria := ?; + if(ispresent(p_primitiveContent.subscription_optional.eventNotificationCriteria)){ + v_primitiveContent.subscription_optional.eventNotificationCriteria := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.expirationCounter)){ - v_primitiveContent.any_1[0].Subscription_optional.expirationCounter := ?; + if(ispresent(p_primitiveContent.subscription_optional.expirationCounter)){ + v_primitiveContent.subscription_optional.expirationCounter := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.groupID)){ - v_primitiveContent.any_1[0].Subscription_optional.groupID := ?; + if(ispresent(p_primitiveContent.subscription_optional.groupID)){ + v_primitiveContent.subscription_optional.groupID := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.notificationForwardingURI)){ - v_primitiveContent.any_1[0].Subscription_optional.notificationForwardingURI := ?; + if(ispresent(p_primitiveContent.subscription_optional.notificationForwardingURI)){ + v_primitiveContent.subscription_optional.notificationForwardingURI := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.batchNotify)){ - v_primitiveContent.any_1[0].Subscription_optional.batchNotify := ?; + if(ispresent(p_primitiveContent.subscription_optional.batchNotify)){ + v_primitiveContent.subscription_optional.batchNotify := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.rateLimit)){ - v_primitiveContent.any_1[0].Subscription_optional.rateLimit := ?; + if(ispresent(p_primitiveContent.subscription_optional.rateLimit)){ + v_primitiveContent.subscription_optional.rateLimit := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.preSubscriptionNotify)){ - v_primitiveContent.any_1[0].Subscription_optional.preSubscriptionNotify := ?; + if(ispresent(p_primitiveContent.subscription_optional.preSubscriptionNotify)){ + v_primitiveContent.subscription_optional.preSubscriptionNotify := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.pendingNotification)){ - v_primitiveContent.any_1[0].Subscription_optional.pendingNotification := ?; + if(ispresent(p_primitiveContent.subscription_optional.pendingNotification)){ + v_primitiveContent.subscription_optional.pendingNotification := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.notificationStoragePriority)){ - v_primitiveContent.any_1[0].Subscription_optional.notificationStoragePriority := ?; + if(ispresent(p_primitiveContent.subscription_optional.notificationStoragePriority)){ + v_primitiveContent.subscription_optional.notificationStoragePriority := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.latestNotify)){ - v_primitiveContent.any_1[0].Subscription_optional.latestNotify := ?; + if(ispresent(p_primitiveContent.subscription_optional.latestNotify)){ + v_primitiveContent.subscription_optional.latestNotify := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.notificationContentType)){ - v_primitiveContent.any_1[0].Subscription_optional.notificationContentType := ?; + if(ispresent(p_primitiveContent.subscription_optional.notificationContentType)){ + v_primitiveContent.subscription_optional.notificationContentType := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.notificationEventCat)){ - v_primitiveContent.any_1[0].Subscription_optional.notificationEventCat := ?; + if(ispresent(p_primitiveContent.subscription_optional.notificationEventCat)){ + v_primitiveContent.subscription_optional.notificationEventCat := ?; } - if(ispresent(p_primitiveContent.any_1[0].Subscription_optional.subscriberURI)){ - v_primitiveContent.any_1[0].Subscription_optional.subscriberURI := ?; + if(ispresent(p_primitiveContent.subscription_optional.subscriberURI)){ + v_primitiveContent.subscription_optional.subscriberURI := ?; } } return v_primitiveContent; diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index eca9bb53bd9e9fc12627a4c7fbdbb2d8fc39e4f9..98add3efd038f85467cc9cab10cfa9cb53e0b4b1 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $ - * $Id: OneM2M_Templates.ttcn 295 2017-06-01 08:20:58Z reinaortega $ + * $Id: OneM2M_Templates.ttcn 296 2017-06-02 13:16:50Z reinaortega $ * @desc Module containing templates for oneM2M * */ @@ -169,9 +169,7 @@ module OneM2M_Templates { from_ := p_originator, requestIdentifier := "m_retrieveResourceAttributeContentOption" & f_rnd(1, 1000000), resourceType := omit, - primitiveContent := { - any_1 := {{AttributeList := p_attributeList}} - }, + primitiveContent := {attributeList := p_attributeList}, roleIDs := omit, originatingTimestamp := omit, requestExpirationTimestamp := omit, @@ -225,9 +223,7 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateAeBase modifies m_update:= { requestIdentifier := "m_updateAe" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{AE_optional := m_contentUpdateAe}} - } + primitiveContent:= {aE_optional := m_contentUpdateAe} }; /** @@ -235,9 +231,7 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateContainerBase modifies m_update:= { requestIdentifier := "m_updateContainer" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{Container_optional := m_contentUpdateContainer}} - } + primitiveContent:= {container_optional := m_contentUpdateContainer} }; /** @@ -245,9 +239,7 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateContentInstanceBase modifies m_update:= { requestIdentifier := "m_updateContentInstance" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{ContentInstance_optional := m_contentUpdateContentInstance}} - } + primitiveContent:= {contentInstance_optional := m_contentUpdateContentInstance} }; /** @@ -255,16 +247,12 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateAcpBase modifies m_update := { requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{AccessControlPolicy_optional := m_contentUpdateAcp}} - } + primitiveContent:= {accessControlPolicy_optional := m_contentUpdateAcp} }; template (value) RequestPrimitive m_updateAcpPrivileges(in template(omit) SetOfAcrs p_privileges := omit, in template(omit) SetOfAcrs p_selfPrivileges := omit) modifies m_update := { requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{AccessControlPolicy_optional := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)}} - } + primitiveContent:= {accessControlPolicy_optional := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)} }; /** @@ -272,9 +260,7 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateGroupBase modifies m_update := { requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{Group_optional := m_contentUpdateGroup}} - } + primitiveContent:= {group_optional := m_contentUpdateGroup} }; /** @@ -282,9 +268,7 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateScheduleBase modifies m_update := { requestIdentifier := "m_updateSchedule" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{Schedule_optional := m_contentUpdateSchedule}} - } + primitiveContent:= {schedule_optional := m_contentUpdateSchedule} }; /** @@ -292,9 +276,7 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updatePollingChannelBase modifies m_update := { requestIdentifier := "m_updatePollingChannel" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{PollingChannel_optional := m_contentUpdatePollingChannel}} - } + primitiveContent:= {pollingChannel_optional := m_contentUpdatePollingChannel} }; /** @@ -302,17 +284,13 @@ module OneM2M_Templates { */ template (value) RequestPrimitive m_updateSubscriptionBase modifies m_update := { requestIdentifier := "m_updateSubscription" & f_rnd(1, 1000000), - primitiveContent:= { - any_1 := {{Subscription_optional := m_contentUpdateSubscription}} - } + primitiveContent:= {subscription_optional := m_contentUpdateSubscription} }; template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod) modifies m_update := { to_ := p_locResourceAddress, requestIdentifier := "m_updateLocationPolicy", - primitiveContent := { - any_1 := {{ LocationPolicy_optional := m_contentUpdateLocationPolicy(p_accessControlPolicyIds, p_locationUpdatePeriod) }} - } + primitiveContent := {locationPolicy_optional := m_contentUpdateLocationPolicy(p_accessControlPolicyIds, p_locationUpdatePeriod)} }; }//end group Update @@ -355,9 +333,7 @@ module OneM2M_Templates { from_ := p_from, requestIdentifier := ?, resourceType := ?, - primitiveContent := { - any_1 := ? - }, + primitiveContent := ?, roleIDs := *, originatingTimestamp := *, requestExpirationTimestamp := *, @@ -391,9 +367,7 @@ module OneM2M_Templates { from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c" requestIdentifier := testcasename() & "-m_createAEAnnc" & f_rnd(1, 1000000), resourceType := int10002, - primitiveContent := { - any_1 := {{AEAnnc_optional := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, valueof(p_to) & "/" & p_stemId)}} - } + primitiveContent := {aEAnnc_optional := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, valueof(p_to) & "/" & p_stemId)} }; /** @@ -401,18 +375,14 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createAEAnnc(template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_to := omit, template (omit) AcpType p_accessControlPolicyIds := omit) modifies mw_create := { resourceType := int10002, - primitiveContent := { - any_1 := {{AEAnnc_optional := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}} - } + primitiveContent := {aEAnnc_optional := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)} }; template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := { from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c" requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000), resourceType := int2, - primitiveContent := { - any_1 := {{AE_optional := m_contentCreateAe(p_accessControlPolicyIds,p_resourceName, p_appId, p_poaList)}} - } + primitiveContent := {aE_optional := m_contentCreateAe(p_accessControlPolicyIds,p_resourceName, p_appId, p_poaList)} }; /** @@ -420,18 +390,14 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int2, - primitiveContent := { - any_1 := {{AE_optional := ?}} - } + primitiveContent := {aE_optional := ?} }; template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := { from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c" requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000), resourceType := int2, - primitiveContent := { - any_1 := {{AE_optional := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}} - } + primitiveContent := {aE_optional := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)} }; /** @@ -440,9 +406,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createAcpBase modifies m_create := { requestIdentifier := testcasename() & "-m_createAcp" & f_rnd(1, 1000000), resourceType := int1, - primitiveContent := { - any_1 := {{AccessControlPolicy_optional := m_contentCreateAcp ()}} - } + primitiveContent := {accessControlPolicy_optional := m_contentCreateAcp ()} }; template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := { @@ -450,9 +414,7 @@ module OneM2M_Templates { from_ := PX_SUPER_USER, requestIdentifier := testcasename() & "-m_createAcp" & f_rnd(1, 1000000), resourceType := int1, - primitiveContent := { - any_1 := {{AccessControlPolicy_optional := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}} - } + primitiveContent := {accessControlPolicy_optional := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)} }; /** @@ -462,9 +424,7 @@ module OneM2M_Templates { to_ := p_to, from_ := p_from, resourceType := int10002, - primitiveContent := { - any_1 := {{AccessControlPolicyAnnc_optional := mw_contentCreateAcpAnnc(-)}} - } + primitiveContent := {accessControlPolicyAnnc_optional := mw_contentCreateAcpAnnc(-)} }; @@ -475,18 +435,14 @@ module OneM2M_Templates { from_ := PX_SUPER_USER, requestIdentifier := testcasename() & "-m_createAcpAux" & f_rnd(1, 1000000), resourceType := int1, - primitiveContent := { - any_1 := {{AccessControlPolicy_optional := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}} - } + primitiveContent := {accessControlPolicy_optional := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)} }; template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := { from_ := PX_SUPER_USER, requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000), resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all - primitiveContent := { - any_1 := {{CSEBase_optional := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}} - } + primitiveContent := {cSEBase_optional := m_contentCreateCSEBase (p_serviceSubscribedAppRule)} }; @@ -496,28 +452,21 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createContainerBase modifies m_create := { requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000), resourceType := int3, - primitiveContent := { - - any_1 := {{Container_optional := m_contentCreateContainer}} - } + primitiveContent := {container_optional := m_contentCreateContainer} }; /** * @desc CREATE request primitive for Container resource wiht no resourceName provided */ template (value) RequestPrimitive m_createContainer_noResourceName modifies m_createContainerBase := { - primitiveContent := { - any_1 := {{Container_optional := m_contentCreateContainer(omit)}} - } + primitiveContent := {container_optional := m_contentCreateContainer(omit)} }; template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := { to_ := p_parentResourceAddress, requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000), resourceType := int3, - primitiveContent := { - any_1 := {{Container_optional := m_contentCreateContainer(p_resourceName)}} - } + primitiveContent := {container_optional := m_contentCreateContainer(p_resourceName)} }; /** @@ -525,9 +474,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int3, - primitiveContent := { - any_1 := {{Container_optional := ?}} - } + primitiveContent := {container_optional := ?} }; /** @@ -535,9 +482,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10003, - primitiveContent := { - any_1 := {{ContainerAnnc_optional := mw_contentCreateContainerAnncBase}} - } + primitiveContent := {containerAnnc_optional := mw_contentCreateContainerAnncBase} }; /** @@ -545,9 +490,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createFlexContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int28, - primitiveContent := { - any_1 := {{FlexContainer_optional := ?}} - } + primitiveContent := {flexContainer_optional := ?} }; /** @@ -555,9 +498,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createGenericIwkOpInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int28, // FIXME: not found in TS004 - primitiveContent := { - any_1 := {{GenericInterworkingOperationInstance_optional := ?}} - } + primitiveContent := {genericInterworkingOperationInstance_optional := ?} }; /** @@ -566,20 +507,14 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createContentInstanceBase modifies m_create := { requestIdentifier := testcasename() & "-m_createContentInstance" & f_rnd(1, 1000000), resourceType := int4, - primitiveContent := { - - any_1 := {{ContentInstance_optional := m_contentCreateContentInstance}} - } + primitiveContent := {contentInstance_optional := m_contentCreateContentInstance} }; /** * @desc CREATE request primitive for Content Instance resource with no resourceName provided */ template (value) RequestPrimitive m_createContentInstance_noResourceName modifies m_createContentInstanceBase := { - primitiveContent := { - - any_1 := {{ContentInstance_optional := m_contentCreateContentInstance(omit)}} - } + primitiveContent := {contentInstance_optional := m_contentCreateContentInstance(omit)} }; template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := { @@ -587,9 +522,7 @@ module OneM2M_Templates { from_ := "admin:admin", requestIdentifier := testcasename() & "-m_createContentInstance" & f_rnd(1, 1000000), resourceType := int4, - primitiveContent := { - any_1 := {{ContentInstance_optional := m_contentCreateContentInstance(p_primitiveContent)}} - } + primitiveContent := {contentInstance_optional := m_contentCreateContentInstance(p_primitiveContent)} }; /** @@ -597,9 +530,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10014, - primitiveContent := { - any_1 := {{ContentInstanceAnnc_optional := ?}} - } + primitiveContent := {contentInstanceAnnc_optional := ?} }; /** @@ -607,9 +538,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10014, - primitiveContent := { - any_1 := {{ContentInstanceAnnc_optional := mw_contentCreateContentInstanceAnncBase}} - } + primitiveContent := {contentInstanceAnnc_optional := mw_contentCreateContentInstanceAnncBase} }; @@ -619,9 +548,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createGroupBase modifies m_create := { requestIdentifier := testcasename() & "-m_createGroup" & f_rnd(1, 1000000), resourceType := int9, - primitiveContent := { - any_1 := {{Group_optional := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)}} //TODO: p_resourceId - } + primitiveContent := {group_optional := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)} //TODO: p_resourceId }; template (value) RequestPrimitive m_createGroup(in template (value) XSD.NonNegativeInteger p_maxNrOfMembers, @@ -633,9 +560,7 @@ module OneM2M_Templates { in template (omit) XSD.String p_name := "MyGroup") modifies m_create := { requestIdentifier := testcasename() & "-m_createGroup" & f_rnd(1, 1000000), resourceType := int9, - primitiveContent := { - any_1 := {{Group_optional := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)}} //TODO: p_resourceId - } + primitiveContent := {group_optional := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)} //TODO: p_resourceId }; /** @@ -643,9 +568,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10009, - primitiveContent := { - any_1 := {{GroupAnnc_optional := ?}} - } + primitiveContent := {groupAnnc_optional := ?} }; /** @@ -653,9 +576,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10009, - primitiveContent := { - any_1 := {{GroupAnnc_optional := mw_contentCreateGroupAnncBase}} - } + primitiveContent := {groupAnnc_optional := mw_contentCreateGroupAnncBase} }; /** @@ -664,9 +585,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createMgmtObjBase modifies m_create := { requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000), resourceType := int13, - primitiveContent := { - any_1 := {{MgmtObj_optional := m_contentCreateMgmtObj (-,-)}} - } + primitiveContent := {mgmtObj_optional := m_contentCreateMgmtObj (-,-)} }; /** @@ -675,9 +594,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createMgmtObj modifies m_create := { requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000), resourceType := int13, - primitiveContent := { - any_1 := {{MgmtObj_optional := m_contentCreateMgmtObj (-, -)}} - } + primitiveContent := {mgmtObj_optional := m_contentCreateMgmtObj (-, -)} }; /** @@ -685,9 +602,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10013, - primitiveContent := { - any_1 := {{MgmtObjAnnc_optional := ?}} - } + primitiveContent := {mgmtObjAnnc_optional := ?} }; /** @@ -695,9 +610,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10013, - primitiveContent := { - any_1 := {{MgmtObjAnnc_optional := mw_contentCreateMgmtObjAnncBase}} - } + primitiveContent := {mgmtObjAnnc_optional := mw_contentCreateMgmtObjAnncBase} }; /** @@ -706,9 +619,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createNodeBase modifies m_create := { requestIdentifier := testcasename() & "-m_createNode" & f_rnd(1, 1000000), resourceType := int14, - primitiveContent := { - any_1 := {{Node_optional := m_contentCreateNode(-, -, -) }} - } + primitiveContent := {node_optional := m_contentCreateNode(-, -, -) } }; /** @@ -717,9 +628,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createNode modifies m_create := { requestIdentifier := testcasename() & "-m_createNode" & f_rnd(1, 1000000), resourceType := int14, - primitiveContent := { - any_1 := {{Node_optional := m_contentCreateNode(-,-,-) }} - } + primitiveContent := {node_optional := m_contentCreateNode(-,-,-) } }; /** @@ -727,9 +636,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10014, - primitiveContent := { - any_1 := {{NodeAnnc_optional := ?}} - } + primitiveContent := {nodeAnnc_optional := ?} }; /** @@ -738,9 +645,7 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createPollingChannelBase modifies m_create := { requestIdentifier := testcasename() & "-m_createPollingChannel" & f_rnd(1, 1000000), resourceType := int15, - primitiveContent := { - any_1 := {{PollingChannel_optional := m_contentCreatePollingChannel (-)}} - } + primitiveContent := {pollingChannel_optional := m_contentCreatePollingChannel (-)} }; template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := { @@ -748,9 +653,7 @@ module OneM2M_Templates { from_ := p_originatorId, requestIdentifier := testcasename() & "-m_createPollingChannel" & f_rnd(1, 1000000), resourceType := int15, - primitiveContent := { - any_1 := {{PollingChannel_optional := m_contentCreatePollingChannel ()}} - } + primitiveContent := {pollingChannel_optional := m_contentCreatePollingChannel ()} }; /** @@ -759,18 +662,14 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createScheduleBase modifies m_create := { requestIdentifier := testcasename() & "-m_createSchedule" & f_rnd(1, 1000000), resourceType := int18, - primitiveContent := { - any_1 := {{Schedule_optional := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}} - } + primitiveContent := {schedule_optional := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})} }; template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := { to_ := p_parentResourceAddress, requestIdentifier := testcasename() & "-m_createSchedule" & f_rnd(1, 1000000), resourceType := int18, - primitiveContent := { - any_1 := {{Schedule_optional := m_contentCreateSchedule (p_scheduleElement, p_name)}} - } + primitiveContent := {schedule_optional := m_contentCreateSchedule (p_scheduleElement, p_name)} }; /** @@ -778,9 +677,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10018, - primitiveContent := { - any_1 := {{ScheduleAnnc_optional := ?}} - } + primitiveContent := {scheduleAnnc_optional := ?} }; /** @@ -788,17 +685,13 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10018, - primitiveContent := { - any_1 := {{ScheduleAnnc_optional := mw_contentCreateScheduleAnncBase}} - } + primitiveContent := {scheduleAnnc_optional := mw_contentCreateScheduleAnncBase} }; template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := { requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule" & f_rnd(1, 1000000), resourceType := int19,//FIXME Is this the correct value? - primitiveContent := { - any_1 := {{ServiceSubscribedAppRule_optional := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedAppIDs, p_allowedAEs)}} - } + primitiveContent := {serviceSubscribedAppRule_optional := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedAppIDs, p_allowedAEs)} }; @@ -808,18 +701,14 @@ module OneM2M_Templates { template (value) RequestPrimitive m_createSubscriptionBase modifies m_create := { requestIdentifier := testcasename() & "-m_createSubscription" & f_rnd(1, 1000000), resourceType := int23, - primitiveContent := { - any_1 := {{Subscription_optional := m_contentCreateSubscription ({"NotInitialized"})}} - } + primitiveContent := {subscription_optional := m_contentCreateSubscription ({"NotInitialized"})} }; template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := { to_ := p_parentResourceAddress, requestIdentifier := testcasename() & "-m_createSubscription" & f_rnd(1, 1000000), resourceType := int23, - primitiveContent := { - any_1 := {{Subscription_optional := m_contentCreateSubscription (p_notificationURI, p_name)}} - } + primitiveContent := {subscription_optional := m_contentCreateSubscription (p_notificationURI, p_name)} }; template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress, @@ -831,18 +720,14 @@ module OneM2M_Templates { in template (omit) XSD.Boolean p_latestNotify := omit, in template (omit) XSD.AnyURI p_subscriberURI := omit, in template (omit) NotificationContentType p_notificationContentType := int1) modifies m_createSubscription := { - primitiveContent := { - any_1 := {{Subscription_optional := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_name, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI, p_notificationContentType)}} - } + primitiveContent := {subscription_optional := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_name, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI, p_notificationContentType)} }; template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) NodeID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := { requestIdentifier := testcasename() & "-m_createLocationPolicy" & f_rnd(1, 1000000), //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it resourceType := int10, - primitiveContent := { - any_1 := {{ LocationPolicy_optional := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) }} - }, + primitiveContent := {locationPolicy_optional := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) }, resultContent := int1//default }; @@ -851,9 +736,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10010, - primitiveContent := { - any_1 := {{LocationPolicyAnnc_optional := ?}} - } + primitiveContent := {locationPolicyAnnc_optional := ?} }; /** @@ -861,16 +744,12 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := { resourceType := int10010, - primitiveContent := { - any_1 := {{LocationPolicyAnnc_optional := mw_contentCreateLocationPolicyAnncBase}} - } + primitiveContent := {locationPolicyAnnc_optional := mw_contentCreateLocationPolicyAnncBase} }; template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := { requestIdentifier := testcasename() & "-m_createNotification" & f_rnd(1, 1000000), - primitiveContent := { - any_1 := {{ Notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)}} - }, + primitiveContent := {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)}, resultContent := int1 //default }; @@ -880,9 +759,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_createSemanticDescriptor(template XSD.ID p_from := *, template XSD.ID p_to := ?, template SemanticDescriptor_optional p_semanticDescriptor := mw_contentCreateSemanticDescriptor) modifies mw_create := { resourceType := int24, - primitiveContent := { - any_1 := {{SemanticDescriptor_optional := p_semanticDescriptor}} - } + primitiveContent := {semanticDescriptor_optional := p_semanticDescriptor} }; }//end group Create @@ -929,7 +806,7 @@ module OneM2M_Templates { from_ := *, requestIdentifier := ?, resourceType := *, - primitiveContent := { any_1 := {{ Notification := mw_contentNotificationBase}} }, + primitiveContent := {notification := mw_contentNotificationBase}, roleIDs := *, originatingTimestamp := *, requestExpirationTimestamp := *, @@ -958,7 +835,7 @@ module OneM2M_Templates { from_ := *, requestIdentifier := ?, resourceType := *, - primitiveContent := { any_1 := {{ AggregatedNotification := ?}} }, + primitiveContent := { aggregatedNotification := ?}, roleIDs := *, originatingTimestamp := *, requestExpirationTimestamp := *, @@ -983,9 +860,7 @@ module OneM2M_Templates { */ template RequestPrimitive mw_notify(in template Notification p_notification) modifies mw_notifyBase := { - primitiveContent := { - any_1 := {{ Notification := p_notification}} - } + primitiveContent := {notification := p_notification} }; diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn index cb53309bac0ff7f738bafb35286d1b95b6f19639..c558257c99ec75a2dd422215adb0578c1f14c967 100644 --- a/LibOneM2M/OneM2M_Types.ttcn +++ b/LibOneM2M/OneM2M_Types.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $ - * $Id: OneM2M_Types.ttcn 295 2017-06-01 08:20:58Z reinaortega $ + * $Id: OneM2M_Types.ttcn 296 2017-06-02 13:16:50Z reinaortega $ * @desc OneM2M data types module * */ @@ -1619,27 +1619,59 @@ with { variant (localTokenIDs) "list"; }; - -type record of anytype Contents; // FIXME necessary for Codec - -type record PrimitiveContent -{ - Contents any_1 - /*record of union { - XSD.String elem, - XSD.String elem_1 - } choice_list*/ +//FIXME Use this type instead type record PrimitiveContent +type union PrimitiveContent { + //TS-0004 - 7.5.2-1 & 7.5.2-2 Common elements to request/response content + //ResourceTypes + AEAnnc_optional aEAnnc_optional, + AE_optional aE_optional, + AccessControlPolicy_optional accessControlPolicy_optional, + AccessControlPolicyAnnc_optional accessControlPolicyAnnc_optional, + ContentInstance_optional contentInstance_optional, + ContentInstanceAnnc_optional contentInstanceAnnc_optional, + Container_optional container_optional, + ContainerAnnc_optional containerAnnc_optional, + FlexContainer_optional flexContainer_optional, + CSEBase_optional cSEBase_optional, + Group_optional group_optional, + GroupAnnc_optional groupAnnc_optional, + LocationPolicy_optional locationPolicy_optional, + LocationPolicyAnnc_optional locationPolicyAnnc_optional, + MgmtObj_optional mgmtObj_optional,//MgmtResource + MgmtObjAnnc_optional mgmtObjAnnc_optional,//AnnouncedMgmtResource + Node_optional node_optional, + NodeAnnc_optional nodeAnnc_optional, + PollingChannel_optional pollingChannel_optional, + Schedule_optional schedule_optional, + ScheduleAnnc_optional scheduleAnnc_optional, + ServiceSubscribedAppRule_optional serviceSubscribedAppRule_optional, + Subscription_optional subscription_optional, + SemanticDescriptor_optional semanticDescriptor_optional, + GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance_optional, + //SecurityInfo + SecurityInfo securityInfo, + //TS-0004 - 7.5.2-1 Elements used for request content + Notification notification, + AggregatedNotification aggregatedNotification, + AttributeList attributeList, + ResponsePrimitive responsePrimitive, + //TS-0004 - 7.5.2-2 Elements used for response content + Resource resource, + URIList uRIList, + ResourceRefList resourceRefList, + AggregatedResponse aggregatedResponse, + URI uRI, + DebugInfo debugInfo, + //Invalid types + AE_update_invalid aE_update_invalid, + ACP_update_invalid aCP_update_invalid, + Container_update_invalid container_update_invalid, + Group_update_invalid group_update_invalid, + PollingChannel_update_invalid pollingChannel_update_invalid, + Schedule_update_invalid schedule_update_invalid, + Subscription_update_invalid subscription_update_invalid, + LocationPolicy_update_invalid locationPolicy_update_invalid } -with { - variant "name as uncapitalized"; -// variant (choice) "untagged"; -// variant (choice.elem) "anyElement from 'http://www.onem2m.org/xml/protocols'"; -// variant (choice.elem_1) "name as 'elem'"; -// variant (choice.elem_1) "anyElement except unqualified, 'http://www.onem2m.org/xml/protocols'"; -}; - - - type record FilterCriteria { @@ -7427,7 +7459,7 @@ group OptionalResourceTypes { variant (choice.choice_list[-]) "untagged"; }; -}//end group +}//end group OptionalResourceTypes group InvalidTypes { diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn index bcd6f5ab0d4d47f1c9d58afaa3788c96e6dc26e9..7f510e2831e8251c76f23db0044fe7b59999cb3d 100644 --- a/OneM2M_Testcases.ttcn +++ b/OneM2M_Testcases.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $ - * $Id: OneM2M_Testcases.ttcn 294 2017-05-23 06:58:33Z reinaortega $ + * $Id: OneM2M_Testcases.ttcn 296 2017-06-02 13:16:50Z reinaortega $ * @desc Module containing test cases for oneM2M * */ @@ -444,7 +444,7 @@ module OneM2M_Testcases { v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi); //Test Body - v_request := valueof(m_responsePrimitive(int2001, "To_be_defined", {any_1 := {{AEAnnc_optional := m_contentCreateAEAnnc({"Credential-ID:None"}, omit, PX_APP_ID, "/CSE_ID/S-AE-ID-STEM")}}})); + v_request := valueof(m_responsePrimitive(int2001, "To_be_defined", {aEAnnc_optional := m_contentCreateAEAnnc({"Credential-ID:None"}, omit, PX_APP_ID, "/CSE_ID/S-AE-ID-STEM")})); mccPort.send(m_response(v_request)); tc_ac.start; @@ -552,7 +552,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; + v_contentResponse.container_optional := mw_contentContainer_rc1; f_CSE_DMR_BV_002(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container } @@ -561,7 +561,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc1; + v_contentResponse.group_optional := mw_contentGroup_rc1; f_CSE_DMR_BV_002(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group } @@ -570,7 +570,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc1; f_CSE_DMR_BV_002(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy } @@ -579,7 +579,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1; + v_contentResponse.schedule_optional := mw_contentSchedule_rc1; f_CSE_DMR_BV_002(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule } @@ -588,7 +588,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel_optional := mw_contentPollingChannelBase; f_CSE_DMR_BV_002(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel } @@ -597,7 +597,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1; + v_contentResponse.subscription_optional := mw_contentSubscription_rc1; f_CSE_DMR_BV_002(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription } @@ -677,7 +677,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc4; + v_contentResponse.container_optional := mw_contentContainer_rc4; f_CSE_DMR_BV_003(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container } @@ -686,7 +686,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc4; + v_contentResponse.group_optional := mw_contentGroup_rc4; f_CSE_DMR_BV_003(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group } @@ -695,7 +695,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc4; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc4; f_CSE_DMR_BV_003(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy } @@ -704,7 +704,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc4; + v_contentResponse.schedule_optional := mw_contentSchedule_rc4; f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule } @@ -713,7 +713,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel_optional := mw_contentPollingChannelBase; f_CSE_DMR_BV_003(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel } @@ -722,7 +722,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc4; + v_contentResponse.subscription_optional := mw_contentSubscription_rc4; f_CSE_DMR_BV_003(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription } @@ -801,7 +801,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc5; + v_contentResponse.container_optional := mw_contentContainer_rc5; f_CSE_DMR_BV_004(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container } @@ -810,7 +810,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc5; + v_contentResponse.group_optional := mw_contentGroup_rc5; f_CSE_DMR_BV_004(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group } @@ -819,7 +819,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc5; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc5; f_CSE_DMR_BV_004(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy } @@ -828,7 +828,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc5; + v_contentResponse.schedule_optional := mw_contentSchedule_rc5; f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule } @@ -837,7 +837,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel_optional := mw_contentPollingChannelBase; f_CSE_DMR_BV_004(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel } @@ -846,7 +846,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc5; + v_contentResponse.subscription_optional := mw_contentSubscription_rc5; f_CSE_DMR_BV_004(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription } @@ -925,7 +925,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc6; + v_contentResponse.container_optional := mw_contentContainer_rc6; f_CSE_DMR_BV_005(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container } @@ -934,7 +934,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc6; + v_contentResponse.group_optional := mw_contentGroup_rc6; f_CSE_DMR_BV_005(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group } @@ -943,7 +943,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc6; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc6; f_CSE_DMR_BV_005(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy } @@ -952,7 +952,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc6; + v_contentResponse.schedule_optional := mw_contentSchedule_rc6; f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule } @@ -961,7 +961,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel_optional := mw_contentPollingChannelBase; f_CSE_DMR_BV_005(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel } @@ -970,7 +970,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc6; + v_contentResponse.subscription_optional := mw_contentSubscription_rc6; f_CSE_DMR_BV_005(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription } @@ -1049,7 +1049,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc8; + v_contentResponse.container_optional := mw_contentContainer_rc8; f_CSE_DMR_BV_006(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container } @@ -1058,7 +1058,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc8; + v_contentResponse.group_optional := mw_contentGroup_rc8; f_CSE_DMR_BV_006(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group } @@ -1067,7 +1067,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc8; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc8; f_CSE_DMR_BV_006(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy } @@ -1076,7 +1076,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc8; + v_contentResponse.schedule_optional := mw_contentSchedule_rc8; f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule } @@ -1085,7 +1085,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel_optional := mw_contentPollingChannelBase; f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel } @@ -1094,7 +1094,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc8; + v_contentResponse.subscription_optional := mw_contentSubscription_rc8; f_CSE_DMR_BV_006(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription } @@ -1187,13 +1187,13 @@ module OneM2M_Testcases { } v_sizeResourceTypeList := lengthof(v_requestPrimitivematrix); - v_createRequest.primitiveContent.any_1[0].Container_optional.resourceName := omit; + v_createRequest.primitiveContent.container_optional.resourceName := omit; for (i := 0; i<v_sizeResourceTypeList; i := i+1){ v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, v_requestPrimitivematrix[i], v_notifyHandler); log(v_responsePrimitive); if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } } @@ -1216,13 +1216,13 @@ module OneM2M_Testcases { } v_sizeResourceTypeList := lengthof(v_requestPrimitivematrix); - v_createRequest.primitiveContent.any_1[0].Group_optional.resourceName := omit; + v_createRequest.primitiveContent.group_optional.resourceName := omit; for (i := 0; i<v_sizeResourceTypeList; i := i+1){ v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int9, v_createRequest, v_requestPrimitivematrix[i],v_notifyHandler); log(v_responsePrimitive); if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.group_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } } @@ -1245,12 +1245,12 @@ module OneM2M_Testcases { } v_sizeResourceTypeList := lengthof(v_requestPrimitivematrix); - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName := omit; + v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit; for (i := 0; i<v_sizeResourceTypeList; i := i+1){ v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, v_requestPrimitivematrix[i], v_notifyHandler);//AccessControlPolicy if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } } @@ -1274,13 +1274,13 @@ module OneM2M_Testcases { } v_sizeResourceTypeList := lengthof(v_requestPrimitivematrix); - v_createRequest.primitiveContent.any_1[0].Schedule_optional.resourceName := omit; + v_createRequest.primitiveContent.schedule_optional.resourceName := omit; for (i := 0; i<v_sizeResourceTypeList; i := i+1){ v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, v_requestPrimitivematrix[i], v_notifyHandler);//Schedule if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } } @@ -1302,12 +1302,12 @@ module OneM2M_Testcases { } v_sizeResourceTypeList := lengthof(v_requestPrimitivematrix); - v_createRequest.primitiveContent.any_1[0].PollingChannel_optional.resourceName := omit; + v_createRequest.primitiveContent.pollingChannel_optional.resourceName := omit; for (i := 0; i<v_sizeResourceTypeList; i := i+1){ v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int15, v_createRequest, v_requestPrimitivematrix[i], v_notifyHandler);//PollingChannel if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } } @@ -1339,12 +1339,12 @@ module OneM2M_Testcases { } v_sizeResourceTypeList := lengthof(v_requestPrimitivematrix); - v_createRequest.primitiveContent.any_1[0].Subscription_optional.resourceName := omit; + v_createRequest.primitiveContent.subscription_optional.resourceName := omit; for (i := 0; i<v_sizeResourceTypeList; i := i+1){ v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, v_requestPrimitivematrix[i], v_notifyHandler);//Subscription if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } } @@ -1375,7 +1375,7 @@ module OneM2M_Testcases { for (i := 0; i<v_sizeResourceTypeList; i := i+1){ if(match(int23, p_requestPrimitiveList[i].resourceType)){ v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred - p_requestPrimitiveList[i].primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; + p_requestPrimitiveList[i].primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_parentIndex))); } v_parentIndex := f_cse_createResource(p_requestPrimitiveList[i].resourceType, p_requestPrimitiveList[i], v_parentIndex); @@ -1385,7 +1385,7 @@ module OneM2M_Testcases { if(match(int23, p_requestPrimitive.resourceType)){ v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred - p_requestPrimitive.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; + p_requestPrimitive.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_parentIndex))); } @@ -1438,10 +1438,10 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_002(int3, m_createContainerBase);//container if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } else { - if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.resourceName != c_defaultContainerResourceName){ + if(v_responsePrimitive.primitiveContent.container_optional.resourceName != c_defaultContainerResourceName){ setverdict(fail, testcasename(), ": Error, resourceName attribute not correct"); } } @@ -1455,10 +1455,10 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_002(int9, m_createGroupBase);//group if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.group_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } else { - if(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.resourceName != c_defaultGroupResourceName){ + if(v_responsePrimitive.primitiveContent.group_optional.resourceName != c_defaultGroupResourceName){ setverdict(fail, testcasename(), ": Error, resourceName attribute not correct"); } } @@ -1472,10 +1472,10 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_002(int1, m_createAcpBase );//accessControlPolicy if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } else { - if(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.resourceName != c_defaultAccessControlPolicyResourceName){ + if(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName != c_defaultAccessControlPolicyResourceName){ setverdict(fail, testcasename(), ": Error, resourceName attribute not correct"); } } @@ -1489,10 +1489,10 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_002(int18, m_createScheduleBase);//Schedule if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } else { - if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.resourceName != c_defaultScheduleResourceName){ + if(v_responsePrimitive.primitiveContent.schedule_optional.resourceName != c_defaultScheduleResourceName){ setverdict(fail, testcasename(), ": Error, resourceName attribute not correct"); } } @@ -1505,10 +1505,10 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_002(int15, m_createPollingChannelBase);//Pollingchannel if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } else { - if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.resourceName != c_defaultPollingChannelResourceName){ + if(v_responsePrimitive.primitiveContent.pollingChannel_optional.resourceName != c_defaultPollingChannelResourceName){ setverdict(fail, testcasename(), ": Error, resourceName attribute not correct"); } } @@ -1522,10 +1522,10 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_002(int23, m_createSubscriptionBase);//Subscription if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.resourceName)){ + if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){ setverdict(fail, testcasename(), ": Error, resourceName attribute not provided"); } else { - if(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.resourceName != c_defaultSubscriptionResourceName){ + if(v_responsePrimitive.primitiveContent.subscription_optional.resourceName != c_defaultSubscriptionResourceName){ setverdict(fail, testcasename(), ": Error, resourceName attribute not correct"); } } @@ -1788,7 +1788,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; var AttributeAux v_invalidAttribute; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances := 0; + v_createRequest.primitiveContent.container_optional.maxNrOfInstances := 0; v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"}; f_CSE_DMR_CRE_BV_005(int3, v_createRequest, v_invalidAttribute); @@ -1799,7 +1799,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; var AttributeAux v_invalidAttribute; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxByteSize := 0; + v_createRequest.primitiveContent.container_optional.maxByteSize := 0; v_invalidAttribute := {name := "maxByteSize", value_ := "-1"}; f_CSE_DMR_CRE_BV_005(int3, v_createRequest, v_invalidAttribute); @@ -1811,7 +1811,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; var AttributeAux v_invalidAttribute; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxInstanceAge := 0; + v_createRequest.primitiveContent.container_optional.maxInstanceAge := 0; v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"}; f_CSE_DMR_CRE_BV_005(int3, v_createRequest, v_invalidAttribute); @@ -1878,7 +1878,7 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_006(int3, v_createRequest); if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.maxNrOfInstances)){ + if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.maxNrOfInstances)){ setverdict(fail, testcasename(), ": Error, maxNrOfInstances attribute not provided"); } } @@ -1892,7 +1892,7 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_006(int3, v_createRequest); if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.maxByteSize)){ + if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.maxByteSize)){ setverdict(fail, testcasename(), ": Error, maxByteSize attribute not provided"); } } @@ -1907,7 +1907,7 @@ module OneM2M_Testcases { v_responsePrimitive := f_CSE_DMR_CRE_BV_006(int3, v_createRequest); if(getverdict == pass){ - if(not ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.maxInstanceAge)){ + if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.maxInstanceAge)){ setverdict(fail, testcasename(), ": Error, maxInstanceAge attribute not provided"); } } @@ -1981,7 +1981,7 @@ module OneM2M_Testcases { // Preamble v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_createRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances := c_maxNumberOfInstances; + v_createRequest.primitiveContent.container_optional.maxNrOfInstances := c_maxNumberOfInstances; v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex); @@ -2038,7 +2038,7 @@ module OneM2M_Testcases { // Preamble v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_createRequest.primitiveContent.any_1[0].Container_optional.maxByteSize := c_maxByteSize; + v_createRequest.primitiveContent.container_optional.maxByteSize := c_maxByteSize; v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex); @@ -2105,14 +2105,14 @@ module OneM2M_Testcases { // Test Body mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))); - v_contentResponse.any_1[0].Container_optional := mw_contentContainerBase; + v_contentResponse.container_optional := mw_contentContainerBase; tc_ac.start; alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Response OK for retrieving"); - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Container_optional.stateTag == vc_resourcesList[v_containerIndex].resource.any_1[0].Container_optional.stateTag + 1) { + if(v_response.primitive.responsePrimitive.primitiveContent.container_optional.stateTag == vc_resourcesList[v_containerIndex].resource.container_optional.stateTag + 1) { setverdict(pass, testcasename() & ": stateTag attribute increased after creation of contentInstance resource"); } else { setverdict(fail, testcasename() & ": stateTag attribute not incremented correctly after creation of contentInstance resource"); @@ -2164,7 +2164,7 @@ module OneM2M_Testcases { v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // Test Body - v_createRequest.primitiveContent.any_1[0].Container_optional.resourceName := c_resourceShortNameLatest; + v_createRequest.primitiveContent.container_optional.resourceName := c_resourceShortNameLatest; v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex); @@ -2221,7 +2221,7 @@ module OneM2M_Testcases { v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // Test Body - v_createRequest.primitiveContent.any_1[0].Container_optional.resourceName := c_resourceShortNameOldest; + v_createRequest.primitiveContent.container_optional.resourceName := c_resourceShortNameOldest; v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex); @@ -2350,7 +2350,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].URI := mw_contentContainer_rc2; + v_contentResponse.uRI := mw_contentContainer_rc2; f_CSE_DMR_CRE_BV_013(int3, m_createContainerBase, v_contentResponse);//Container } @@ -2359,7 +2359,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].URI := mw_contentGroup_rc2; + v_contentResponse.uRI := mw_contentGroup_rc2; f_CSE_DMR_CRE_BV_013(int9, m_createGroupBase, v_contentResponse);//Group } @@ -2368,7 +2368,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].URI := mw_contentAcp_rc2; + v_contentResponse.uRI := mw_contentAcp_rc2; f_CSE_DMR_CRE_BV_013(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } @@ -2377,7 +2377,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].URI := mw_contentSchedule_rc2; + v_contentResponse.uRI := mw_contentSchedule_rc2; f_CSE_DMR_CRE_BV_013(int18, m_createScheduleBase, v_contentResponse);//Schedule } @@ -2386,7 +2386,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].URI := mw_contentPollingChannel_rc2; + v_contentResponse.uRI := mw_contentPollingChannel_rc2; f_CSE_DMR_CRE_BV_013(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } @@ -2395,7 +2395,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].URI := mw_contentSubscription_rc2; + v_contentResponse.uRI := mw_contentSubscription_rc2; f_CSE_DMR_CRE_BV_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -2457,7 +2457,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Resource := mw_contentContainer_rc3; + v_contentResponse.resource := mw_contentContainer_rc3; f_CSE_DMR_CRE_BV_014(int3, m_createContainerBase, v_contentResponse);//Container } @@ -2466,7 +2466,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Resource := mw_contentGroup_rc3; + v_contentResponse.resource := mw_contentGroup_rc3; f_CSE_DMR_CRE_BV_014(int9, m_createGroupBase, v_contentResponse);//Group } @@ -2475,7 +2475,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Resource := mw_contentAcp_rc3; + v_contentResponse.resource := mw_contentAcp_rc3; f_CSE_DMR_CRE_BV_014(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } @@ -2484,7 +2484,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Resource := mw_contentSchedule_rc3; + v_contentResponse.resource := mw_contentSchedule_rc3; f_CSE_DMR_CRE_BV_014(int18, m_createScheduleBase, v_contentResponse);//Schedule } @@ -2493,7 +2493,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Resource := mw_contentPollingChannel_rc3; + v_contentResponse.resource := mw_contentPollingChannel_rc3; f_CSE_DMR_CRE_BV_014(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } @@ -2502,7 +2502,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Resource := mw_contentSubscription_rc3; + v_contentResponse.resource := mw_contentSubscription_rc3; f_CSE_DMR_CRE_BV_014(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -2565,7 +2565,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {"NotInitialized"}; + v_createRequest.primitiveContent.container_optional.accessControlPolicyIDs := {"NotInitialized"}; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); } @@ -2575,7 +2575,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"expirationTime", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.expirationTime := "20301231T012345"; + v_createRequest.primitiveContent.container_optional.expirationTime := "20301231T012345"; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); @@ -2586,7 +2586,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"labels", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.labels := {"MyLabel"}; + v_createRequest.primitiveContent.container_optional.labels := {"MyLabel"}; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); @@ -2597,7 +2597,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"maxNrOfInstances", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances := 0; + v_createRequest.primitiveContent.container_optional.maxNrOfInstances := 0; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); @@ -2608,7 +2608,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"maxByteSize", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxByteSize := 0; + v_createRequest.primitiveContent.container_optional.maxByteSize := 0; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); @@ -2619,7 +2619,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"maxInstanceAge", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxInstanceAge := 0; + v_createRequest.primitiveContent.container_optional.maxInstanceAge := 0; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); @@ -2630,7 +2630,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; const AttributeAux c_optionalAttribute := {"ontologyRef", omit}; - v_createRequest.primitiveContent.any_1[0].Container_optional.ontologyRef := "MyOntologyRef"; + v_createRequest.primitiveContent.container_optional.ontologyRef := "MyOntologyRef"; f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute); @@ -2641,7 +2641,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeAux c_optionalAttribute := {"expirationTime", omit}; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.expirationTime := "20301231T012345"; + v_createRequest.primitiveContent.contentInstance_optional.expirationTime := "20301231T012345"; f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute); } @@ -2651,7 +2651,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeAux c_optionalAttribute := {"labels", omit}; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.labels := {"MyLabel"}; + v_createRequest.primitiveContent.contentInstance_optional.labels := {"MyLabel"}; f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute); @@ -2662,7 +2662,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeAux c_optionalAttribute := {"creator", omit}; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.creator := "MyCreator"; + v_createRequest.primitiveContent.contentInstance_optional.creator := "MyCreator"; f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute); @@ -2673,7 +2673,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeAux c_optionalAttribute := {"contentInfo", omit}; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.contentInfo := "MyContentInfo"; + v_createRequest.primitiveContent.contentInstance_optional.contentInfo := "MyContentInfo"; f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute); @@ -2684,7 +2684,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; const AttributeAux c_optionalAttribute := {"ontologyRef", omit}; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.ontologyRef := "MyOntologyRef"; + v_createRequest.primitiveContent.contentInstance_optional.ontologyRef := "MyOntologyRef"; f_CSE_DMR_CRE_BV_015(int4, v_createRequest, c_optionalAttribute); @@ -2695,7 +2695,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createAcpBase; const AttributeAux c_optionalAttribute := {"expirationTime", omit}; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.expirationTime := "20301231T012345"; + v_createRequest.primitiveContent.accessControlPolicy_optional.expirationTime := "20301231T012345"; f_CSE_DMR_CRE_BV_015(int1, v_createRequest, c_optionalAttribute); @@ -2706,7 +2706,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createAcpBase; const AttributeAux c_optionalAttribute := {"labels", omit}; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := {"MyLabel"}; + v_createRequest.primitiveContent.accessControlPolicy_optional.labels := {"MyLabel"}; f_CSE_DMR_CRE_BV_015(int1, v_createRequest, c_optionalAttribute); @@ -2717,7 +2717,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := {"NotInitialized"}; + v_createRequest.primitiveContent.subscription_optional.accessControlPolicyIDs := {"NotInitialized"}; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); } @@ -2727,7 +2727,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"expirationTime", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationTime := "20301231T012345"; + v_createRequest.primitiveContent.subscription_optional.expirationTime := "20301231T012345"; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2738,7 +2738,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"labels", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.labels := {"MyLabel"}; + v_createRequest.primitiveContent.subscription_optional.labels := {"MyLabel"}; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2749,7 +2749,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"eventNotificationCriteria", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -)); + v_createRequest.primitiveContent.subscription_optional.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -)); f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2760,7 +2760,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"expirationCounter", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationCounter := 1; + v_createRequest.primitiveContent.subscription_optional.expirationCounter := 1; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2771,7 +2771,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"groupID", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.groupID := "MyGroupID"; + v_createRequest.primitiveContent.subscription_optional.groupID := "MyGroupID"; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2782,7 +2782,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"notificationForwardingURI", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationForwardingURI := "MyForwardingURI"; + v_createRequest.primitiveContent.subscription_optional.notificationForwardingURI := "MyForwardingURI"; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2793,7 +2793,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"batchNotify", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.batchNotify := {0, "PT1S"}; + v_createRequest.primitiveContent.subscription_optional.batchNotify := {0, "PT1S"}; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2804,7 +2804,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"rateLimit", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.rateLimit := {0, omit}; + v_createRequest.primitiveContent.subscription_optional.rateLimit := {0, omit}; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2815,7 +2815,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"preSubscriptionNotify", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.preSubscriptionNotify := 1; + v_createRequest.primitiveContent.subscription_optional.preSubscriptionNotify := 1; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2826,7 +2826,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"pendingNotification", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.pendingNotification := int1; + v_createRequest.primitiveContent.subscription_optional.pendingNotification := int1; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); } @@ -2836,7 +2836,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"notificationStoragePriority", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationStoragePriority := 1; + v_createRequest.primitiveContent.subscription_optional.notificationStoragePriority := 1; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2847,7 +2847,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"latestNotify", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.latestNotify := true; + v_createRequest.primitiveContent.subscription_optional.latestNotify := true; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2858,7 +2858,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"notificationContentType", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationContentType := int1; + v_createRequest.primitiveContent.subscription_optional.notificationContentType := int1; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2869,7 +2869,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"notificationEventCat", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationEventCat := {alt_1 := 100}; + v_createRequest.primitiveContent.subscription_optional.notificationEventCat := {alt_1 := 100}; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2880,7 +2880,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"creator", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.creator := "MyCreator"; + v_createRequest.primitiveContent.subscription_optional.creator := "MyCreator"; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2891,7 +2891,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; const AttributeAux c_optionalAttribute := {"subscriberURI", omit}; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.subscriberURI := "MySubscriberURI"; + v_createRequest.primitiveContent.subscription_optional.subscriberURI := "MySubscriberURI"; f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute); @@ -2977,7 +2977,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createAcpBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.accessControlPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int1, v_createRequest, mw_createAccessControlPolicyAnnc);//AccessControlPolicy } @@ -2987,7 +2987,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Container_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.container_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int3, v_createRequest, mw_createContainerAnncBase);//Container } @@ -2997,7 +2997,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContentInstanceBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.contentInstance_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int4, v_createRequest, mw_createContentInstanceAnncBase);//ContentInstance } @@ -3007,7 +3007,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createGroupBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Group_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.group_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int9, v_createRequest, mw_createGroupAnncBase);//Group } @@ -3017,7 +3017,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit); var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].LocationPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.locationPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int10, v_createRequest, mw_createLocationPolicyAnncBase);//LocationPolicy } @@ -3027,7 +3027,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createMgmtObjBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].MgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.mgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int13, v_createRequest, mw_createMgmtObjAnncBase);//MgmtObj } @@ -3037,7 +3037,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createNodeBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Node_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.node_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int14, v_createRequest, mw_createNodeAnnc);//Node } @@ -3047,7 +3047,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createScheduleBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Schedule_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.schedule_optional.announceTo := {f_getAnnouncementTargetPoA()}; f_CSE_DMR_CRE_BV_016(int18, v_createRequest, mw_createScheduleAnncBase);//Schedule } @@ -3116,16 +3116,16 @@ module OneM2M_Testcases { var RequestPrimitive v_requestPrimitive; var XSD.NonNegativeInteger maxByteSize := 512; //Correct value? Shall be indicated in TP? - v_createRequest.primitiveContent.any_1[0].Container_optional.announceTo := {f_getAnnouncementTargetPoA()}; - v_createRequest.primitiveContent.any_1[0].Container_optional.maxByteSize := maxByteSize; - v_createRequest.primitiveContent.any_1[0].Container_optional.announcedAttribute := {"maxByteSize"}; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.container_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.container_optional.maxByteSize := maxByteSize; + v_createRequest.primitiveContent.container_optional.announcedAttribute := {"maxByteSize"}; //Correct value? Shall be indicated in TP? v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int3, v_createRequest, mw_createContainerAnncBase());//Container if(getverdict == pass){ //Check if maxByteSize attribute has been announced - if (ispresent(v_requestPrimitive.primitiveContent.any_1[0].ContainerAnnc_optional.maxByteSize)){ - if(v_requestPrimitive.primitiveContent.any_1[0].ContainerAnnc_optional.maxByteSize != maxByteSize){ + if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc_optional.maxByteSize)){ + if(v_requestPrimitive.primitiveContent.containerAnnc_optional.maxByteSize != maxByteSize){ setverdict(fail, testcasename() & ": Error: Value of maxByteSize has not been announced successfully"); }else{ setverdict(pass, testcasename() & ": Value of maxByteSize has been announced successfully"); @@ -3142,16 +3142,16 @@ module OneM2M_Testcases { var RequestPrimitive v_requestPrimitive; var XSD.NonNegativeInteger contentSize := 512; //Correct value? Shall be indicated in TP? - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.announceTo := {f_getAnnouncementTargetPoA()}; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.contentSize := contentSize; - v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.announcedAttribute := {"contentSize"}; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.contentInstance_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.contentInstance_optional.contentSize := contentSize; + v_createRequest.primitiveContent.contentInstance_optional.announcedAttribute := {"contentSize"}; //Correct value? Shall be indicated in TP? v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int4, v_createRequest, mw_createContentInstanceAnncBase());//ContentInstance if(getverdict == pass){ //Check if contentSize attribute has been announced - if (ispresent(v_requestPrimitive.primitiveContent.any_1[0].ContentInstanceAnnc_optional.contentSize)){ - if(v_requestPrimitive.primitiveContent.any_1[0].ContentInstanceAnnc_optional.contentSize != contentSize){ + if (ispresent(v_requestPrimitive.primitiveContent.contentInstanceAnnc_optional.contentSize)){ + if(v_requestPrimitive.primitiveContent.contentInstanceAnnc_optional.contentSize != contentSize){ setverdict(fail, testcasename() & ": Error: Value of contentSize has not been announced successfully"); }else{ setverdict(pass, testcasename() & ": Value of contentSize has been announced successfully"); @@ -3168,16 +3168,16 @@ module OneM2M_Testcases { var RequestPrimitive v_requestPrimitive; var XSD.PositiveInteger maxNrOfMembers := 10; //Correct value? Shall be indicated in TP? - v_createRequest.primitiveContent.any_1[0].Group_optional.announceTo := {f_getAnnouncementTargetPoA()}; - v_createRequest.primitiveContent.any_1[0].Group_optional.maxNrOfMembers := maxNrOfMembers; - v_createRequest.primitiveContent.any_1[0].Group_optional.announcedAttribute := {"maxNrOfMembers"}; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.group_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.group_optional.maxNrOfMembers := maxNrOfMembers; + v_createRequest.primitiveContent.group_optional.announcedAttribute := {"maxNrOfMembers"}; //Correct value? Shall be indicated in TP? v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int9, v_createRequest, mw_createGroupAnncBase());//Group if(getverdict == pass){ //Check if maxNrOfMembers attribute has been announced - if (ispresent(v_requestPrimitive.primitiveContent.any_1[0].GroupAnnc_optional.maxNrOfMembers)){ - if(v_requestPrimitive.primitiveContent.any_1[0].GroupAnnc_optional.maxNrOfMembers != maxNrOfMembers){ + if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc_optional.maxNrOfMembers)){ + if(v_requestPrimitive.primitiveContent.groupAnnc_optional.maxNrOfMembers != maxNrOfMembers){ setverdict(fail, testcasename() & ": Error: Value of maxNrOfMembers has not been announced successfully"); }else{ setverdict(pass, testcasename() & ": Value of maxNrOfMembers has been announced successfully"); @@ -3194,16 +3194,16 @@ module OneM2M_Testcases { var RequestPrimitive v_requestPrimitive; var LocationSource locationSource := int1;//Network-based //Correct value? Shall be indicated in TP? - v_createRequest.primitiveContent.any_1[0].LocationPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()}; - v_createRequest.primitiveContent.any_1[0].LocationPolicy_optional.locationSource := locationSource; - v_createRequest.primitiveContent.any_1[0].LocationPolicy_optional.announcedAttribute := {"locationSource"}; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.locationPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.locationPolicy_optional.locationSource := locationSource; + v_createRequest.primitiveContent.locationPolicy_optional.announcedAttribute := {"locationSource"}; //Correct value? Shall be indicated in TP? v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int10, v_createRequest, mw_createLocationPolicyAnncBase());//LocationPolicy if(getverdict == pass){ //Check if locationSource attribute has been announced - if (ispresent(v_requestPrimitive.primitiveContent.any_1[0].LocationPolicyAnnc_optional.locationSource)){ - if(v_requestPrimitive.primitiveContent.any_1[0].LocationPolicyAnnc_optional.locationSource != locationSource){ + if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc_optional.locationSource)){ + if(v_requestPrimitive.primitiveContent.locationPolicyAnnc_optional.locationSource != locationSource){ setverdict(fail, testcasename() & ": Error: Value of locationSource has not been announced successfully"); }else{ setverdict(pass, testcasename() & ": Value of locationSource has been announced successfully"); @@ -3220,16 +3220,16 @@ module OneM2M_Testcases { var RequestPrimitive v_requestPrimitive; var XSD.String description := "Description of mgmtObj"; //Correct value? Shall be indicated in TP? - v_createRequest.primitiveContent.any_1[0].MgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()}; - v_createRequest.primitiveContent.any_1[0].MgmtObj_optional.description := description; - v_createRequest.primitiveContent.any_1[0].MgmtObj_optional.announcedAttribute := {"description"}; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.mgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.mgmtObj_optional.description := description; + v_createRequest.primitiveContent.mgmtObj_optional.announcedAttribute := {"description"}; //Correct value? Shall be indicated in TP? v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int13, v_createRequest, mw_createMgmtObjAnncBase());//MgmtObj if(getverdict == pass){ //Check if description attribute has been announced - if (ispresent(v_requestPrimitive.primitiveContent.any_1[0].MgmtObjAnnc_optional.description)){ - if(v_requestPrimitive.primitiveContent.any_1[0].MgmtObjAnnc_optional.description != description){ + if (ispresent(v_requestPrimitive.primitiveContent.mgmtObjAnnc_optional.description)){ + if(v_requestPrimitive.primitiveContent.mgmtObjAnnc_optional.description != description){ setverdict(fail, testcasename() & ": Error: Value of description has not been announced successfully"); }else{ setverdict(pass, testcasename() & ": Value of description has been announced successfully"); @@ -3245,7 +3245,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createNodeBase; var RequestPrimitive v_requestPrimitive; - v_createRequest.primitiveContent.any_1[0].Node_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.node_optional.announceTo := {f_getAnnouncementTargetPoA()}; //TODO node to be done. hostedCSELink attribute (OA) to be added!!! @@ -3258,16 +3258,16 @@ module OneM2M_Testcases { var RequestPrimitive v_requestPrimitive; var ScheduleEntries scheduleElement := {{"0,0,0 1 2,1,1,*"}}; - v_createRequest.primitiveContent.any_1[0].Schedule_optional.announceTo := {f_getAnnouncementTargetPoA()}; - v_createRequest.primitiveContent.any_1[0].Schedule_optional.scheduleElement := scheduleElement; //Correct value? Shall be indicated in TP? - v_createRequest.primitiveContent.any_1[0].Schedule_optional.announcedAttribute := {"scheduleElement"}; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.schedule_optional.announceTo := {f_getAnnouncementTargetPoA()}; + v_createRequest.primitiveContent.schedule_optional.scheduleElement := scheduleElement; //Correct value? Shall be indicated in TP? + v_createRequest.primitiveContent.schedule_optional.announcedAttribute := {"scheduleElement"}; //Correct value? Shall be indicated in TP? v_requestPrimitive := f_CSE_DMR_CRE_BV_017(int18, v_createRequest, mw_createScheduleAnncBase());//Schedule if(getverdict == pass){ //Check if scheduleElement attribute has been announced - if (ispresent(v_requestPrimitive.primitiveContent.any_1[0].ScheduleAnnc_optional.scheduleElement)){ - if(v_requestPrimitive.primitiveContent.any_1[0].ScheduleAnnc_optional.scheduleElement != scheduleElement){ + if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc_optional.scheduleElement)){ + if(v_requestPrimitive.primitiveContent.scheduleAnnc_optional.scheduleElement != scheduleElement){ setverdict(fail, testcasename() & ": Error: Value of scheduleElement has not been announced successfully"); }else{ setverdict(pass, testcasename() & ": Value of scheduleElement has been announced successfully"); @@ -3347,7 +3347,7 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; + v_contentResponse.container_optional := mw_contentContainer_rc1; v_responsePrimitive := f_CSE_DMR_RET_BV_001(int3, m_createContainerBase, v_contentResponse);//Container @@ -3358,7 +3358,7 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc1; + v_contentResponse.group_optional := mw_contentGroup_rc1; v_responsePrimitive := f_CSE_DMR_RET_BV_001(int9, m_createGroupBase, v_contentResponse);//Group @@ -3369,7 +3369,7 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc1; v_responsePrimitive := f_CSE_DMR_RET_BV_001(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy @@ -3380,7 +3380,7 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1; + v_contentResponse.schedule_optional := mw_contentSchedule_rc1; v_responsePrimitive := f_CSE_DMR_RET_BV_001(int18, m_createScheduleBase, v_contentResponse);//Schedule @@ -3391,7 +3391,7 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase; + v_contentResponse.pollingChannel_optional := mw_contentPollingChannelBase; v_responsePrimitive := f_CSE_DMR_RET_BV_001(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel @@ -3402,7 +3402,7 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1; + v_contentResponse.subscription_optional := mw_contentSubscription_rc1; v_responsePrimitive := f_CSE_DMR_RET_BV_001(int23, m_createSubscriptionBase, v_contentResponse);//Subscription @@ -3541,7 +3541,7 @@ module OneM2M_Testcases { // Local variables var template RequestPrimitive v_requestPrimitive := m_createAcpBase; - v_requestPrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61; + v_requestPrimitive.primitiveContent.accessControlPolicy_optional.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61; f_CSE_DMR_RET_BO_003(int1, v_requestPrimitive);//AccessControlPolicy } @@ -3637,8 +3637,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := m_contentContainer_allOmit; - v_contentResponse.any_1[0].Container_optional.parentID := ?; + v_contentResponse.container_optional := m_contentContainer_allOmit; + v_contentResponse.container_optional.parentID := ?; f_CSE_DMR_RET_BV_004(int3, m_createContainerBase, v_contentResponse);//Container } @@ -3647,8 +3647,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := m_contentGroup_allOmit; - v_contentResponse.any_1[0].Group_optional.parentID := ?; + v_contentResponse.group_optional := m_contentGroup_allOmit; + v_contentResponse.group_optional.parentID := ?; f_CSE_DMR_RET_BV_004(int9, m_createGroupBase, v_contentResponse);//Group } @@ -3657,8 +3657,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := m_contentAcp_allOmit; - v_contentResponse.any_1[0].AccessControlPolicy_optional.parentID := ?; + v_contentResponse.accessControlPolicy_optional := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy_optional.parentID := ?; f_CSE_DMR_RET_BV_004(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } @@ -3667,8 +3667,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := m_contentSchedule_allOmit; - v_contentResponse.any_1[0].Schedule_optional.parentID := ?; + v_contentResponse.schedule_optional := m_contentSchedule_allOmit; + v_contentResponse.schedule_optional.parentID := ?; f_CSE_DMR_RET_BV_004(int18, m_createScheduleBase,v_contentResponse);//Schedule } @@ -3677,8 +3677,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := m_contentPollingChannel_allOmit; - v_contentResponse.any_1[0].PollingChannel_optional.parentID := ?; + v_contentResponse.pollingChannel_optional := m_contentPollingChannel_allOmit; + v_contentResponse.pollingChannel_optional.parentID := ?; f_CSE_DMR_RET_BV_004(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } @@ -3687,8 +3687,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := m_contentSubscription_allOmit; - v_contentResponse.any_1[0].Subscription_optional.parentID := ?; + v_contentResponse.subscription_optional := m_contentSubscription_allOmit; + v_contentResponse.subscription_optional.parentID := ?; f_CSE_DMR_RET_BV_004(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -3757,8 +3757,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := m_contentContainer_allOmit; - v_contentResponse.any_1[0].Container_optional.parentID := ?; + v_contentResponse.container_optional := m_contentContainer_allOmit; + v_contentResponse.container_optional.parentID := ?; f_CSE_DMR_RET_BV_005(int3, m_createContainerBase, v_contentResponse);//Container } @@ -3767,8 +3767,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := m_contentGroup_allOmit; - v_contentResponse.any_1[0].Group_optional.parentID := ?; + v_contentResponse.group_optional := m_contentGroup_allOmit; + v_contentResponse.group_optional.parentID := ?; f_CSE_DMR_RET_BV_005(int9, m_createGroupBase, v_contentResponse);//Group } @@ -3777,8 +3777,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := m_contentAcp_allOmit; - v_contentResponse.any_1[0].AccessControlPolicy_optional.parentID := ?; + v_contentResponse.accessControlPolicy_optional := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy_optional.parentID := ?; f_CSE_DMR_RET_BV_005(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } @@ -3787,8 +3787,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := m_contentSchedule_allOmit; - v_contentResponse.any_1[0].Schedule_optional.parentID := ?; + v_contentResponse.schedule_optional := m_contentSchedule_allOmit; + v_contentResponse.schedule_optional.parentID := ?; f_CSE_DMR_RET_BV_005(int18, m_createScheduleBase, v_contentResponse);//Schedule } @@ -3797,8 +3797,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := m_contentPollingChannel_allOmit; - v_contentResponse.any_1[0].PollingChannel_optional.parentID := ?; + v_contentResponse.pollingChannel_optional := m_contentPollingChannel_allOmit; + v_contentResponse.pollingChannel_optional.parentID := ?; f_CSE_DMR_RET_BV_005(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } @@ -3807,8 +3807,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := m_contentSubscription_allOmit; - v_contentResponse.any_1[0].Subscription_optional.parentID := ?; + v_contentResponse.subscription_optional := m_contentSubscription_allOmit; + v_contentResponse.subscription_optional.parentID := ?; f_CSE_DMR_RET_BV_005(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -3877,9 +3877,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := m_contentContainer_allOmit; - v_contentResponse.any_1[0].Container_optional.parentID := ?; - v_contentResponse.any_1[0].Container_optional.creationTime := ?; + v_contentResponse.container_optional := m_contentContainer_allOmit; + v_contentResponse.container_optional.parentID := ?; + v_contentResponse.container_optional.creationTime := ?; f_CSE_DMR_RET_BV_006(int3, m_createContainerBase, v_contentResponse);//Container } @@ -3888,9 +3888,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := m_contentGroup_allOmit; - v_contentResponse.any_1[0].Group_optional.parentID := ?; - v_contentResponse.any_1[0].Group_optional.creationTime := ?; + v_contentResponse.group_optional := m_contentGroup_allOmit; + v_contentResponse.group_optional.parentID := ?; + v_contentResponse.group_optional.creationTime := ?; f_CSE_DMR_RET_BV_006(int9, m_createGroupBase, v_contentResponse);//Group } @@ -3899,9 +3899,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := m_contentAcp_allOmit; - v_contentResponse.any_1[0].AccessControlPolicy_optional.parentID := ?; - v_contentResponse.any_1[0].AccessControlPolicy_optional.creationTime := ?; + v_contentResponse.accessControlPolicy_optional := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy_optional.parentID := ?; + v_contentResponse.accessControlPolicy_optional.creationTime := ?; f_CSE_DMR_RET_BV_006(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } @@ -3910,9 +3910,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := m_contentSchedule_allOmit; - v_contentResponse.any_1[0].Schedule_optional.parentID := ?; - v_contentResponse.any_1[0].Schedule_optional.creationTime := ?; + v_contentResponse.schedule_optional := m_contentSchedule_allOmit; + v_contentResponse.schedule_optional.parentID := ?; + v_contentResponse.schedule_optional.creationTime := ?; f_CSE_DMR_RET_BV_006(int18, m_createScheduleBase, v_contentResponse);//Schedule } @@ -3921,9 +3921,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].PollingChannel_optional := m_contentPollingChannel_allOmit; - v_contentResponse.any_1[0].PollingChannel_optional.parentID := ?; - v_contentResponse.any_1[0].PollingChannel_optional.creationTime := ?; + v_contentResponse.pollingChannel_optional := m_contentPollingChannel_allOmit; + v_contentResponse.pollingChannel_optional.parentID := ?; + v_contentResponse.pollingChannel_optional.creationTime := ?; f_CSE_DMR_RET_BV_006(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } @@ -3932,9 +3932,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := m_contentSubscription_allOmit; - v_contentResponse.any_1[0].Subscription_optional.parentID := ?; - v_contentResponse.any_1[0].Subscription_optional.creationTime := ?; + v_contentResponse.subscription_optional := m_contentSubscription_allOmit; + v_contentResponse.subscription_optional.parentID := ?; + v_contentResponse.subscription_optional.creationTime := ?; f_CSE_DMR_RET_BV_006(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -4269,8 +4269,8 @@ module OneM2M_Testcases { v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); - v_contentResponse.any_1[0].ContentInstance_optional := mw_contentContentInstanceBase; - v_contentResponse.any_1[0].ContentInstance_optional.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.any_1[0].ContentInstance_optional.resourceName; + v_contentResponse.contentInstance_optional := mw_contentContentInstanceBase; + v_contentResponse.contentInstance_optional.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance_optional.resourceName; // Test Body mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)))); @@ -4384,8 +4384,8 @@ module OneM2M_Testcases { v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex); - v_contentResponse.any_1[0].ContentInstance_optional := mw_contentContentInstanceBase; - v_contentResponse.any_1[0].ContentInstance_optional.resourceName := vc_resourcesList[v_contentInstanceIndex2].resource.any_1[0].ContentInstance_optional.resourceName; + v_contentResponse.contentInstance_optional := mw_contentContentInstanceBase; + v_contentResponse.contentInstance_optional.resourceName := vc_resourcesList[v_contentInstanceIndex2].resource.contentInstance_optional.resourceName; // Test Body @@ -4426,7 +4426,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc1; f_CSE_DMR_RET_BV_013(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy @@ -4436,7 +4436,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; + v_contentResponse.aE_optional := mw_contentAeBase; f_CSE_DMR_RET_BV_013(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE @@ -4446,7 +4446,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; + v_contentResponse.container_optional := mw_contentContainer_rc1; f_CSE_DMR_RET_BV_013(int3, m_createContainerBase, v_contentResponse);//Container @@ -4456,7 +4456,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc1; + v_contentResponse.group_optional := mw_contentGroup_rc1; f_CSE_DMR_RET_BV_013(int9, m_createGroupBase, v_contentResponse);//Group @@ -4466,7 +4466,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1; + v_contentResponse.schedule_optional := mw_contentSchedule_rc1; f_CSE_DMR_RET_BV_013(int18, m_createScheduleBase, v_contentResponse);//Schedule @@ -4476,7 +4476,7 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1; + v_contentResponse.subscription_optional := mw_contentSubscription_rc1; f_CSE_DMR_RET_BV_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription @@ -4544,7 +4544,7 @@ module OneM2M_Testcases { // Local variables var template RequestPrimitive v_requestPrimitive := m_createAcpBase; - v_requestPrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61; + v_requestPrimitive.primitiveContent.accessControlPolicy_optional.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61; f_CSE_DMR_RET_BO_014(int1, v_requestPrimitive);//AccessControlPolicy } @@ -4651,8 +4651,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := m_contentAcp_allOmit; - v_contentResponse.any_1[0].AccessControlPolicy_optional.parentID := ?; + v_contentResponse.accessControlPolicy_optional := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy_optional.parentID := ?; f_CSE_DMR_RET_BV_015(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } @@ -4661,8 +4661,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AE_optional := m_contentAe_allOmit; - v_contentResponse.any_1[0].AE_optional.parentID := ?; + v_contentResponse.aE_optional := m_contentAe_allOmit; + v_contentResponse.aE_optional.parentID := ?; f_CSE_DMR_RET_BV_015(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE } @@ -4671,8 +4671,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := m_contentContainer_allOmit; - v_contentResponse.any_1[0].Container_optional.parentID := ?; + v_contentResponse.container_optional := m_contentContainer_allOmit; + v_contentResponse.container_optional.parentID := ?; f_CSE_DMR_RET_BV_015(int3, m_createContainerBase, v_contentResponse);//Container } @@ -4681,8 +4681,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := m_contentGroup_allOmit; - v_contentResponse.any_1[0].Group_optional.parentID := ?; + v_contentResponse.group_optional := m_contentGroup_allOmit; + v_contentResponse.group_optional.parentID := ?; f_CSE_DMR_RET_BV_015(int9, m_createGroupBase, v_contentResponse);//Group } @@ -4691,8 +4691,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := m_contentSchedule_allOmit; - v_contentResponse.any_1[0].Schedule_optional.parentID := ?; + v_contentResponse.schedule_optional := m_contentSchedule_allOmit; + v_contentResponse.schedule_optional.parentID := ?; f_CSE_DMR_RET_BV_015(int18, m_createScheduleBase,v_contentResponse);//Schedule } @@ -4701,8 +4701,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := m_contentSubscription_allOmit; - v_contentResponse.any_1[0].Subscription_optional.parentID := ?; + v_contentResponse.subscription_optional := m_contentSubscription_allOmit; + v_contentResponse.subscription_optional.parentID := ?; f_CSE_DMR_RET_BV_015(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -4771,8 +4771,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := m_contentAcp_allOmit; - v_contentResponse.any_1[0].AccessControlPolicy_optional.parentID := ?; + v_contentResponse.accessControlPolicy_optional := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy_optional.parentID := ?; f_CSE_DMR_RET_BV_016(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } @@ -4781,8 +4781,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AE_optional := m_contentAe_allOmit; - v_contentResponse.any_1[0].AE_optional.parentID := ?; + v_contentResponse.aE_optional := m_contentAe_allOmit; + v_contentResponse.aE_optional.parentID := ?; f_CSE_DMR_RET_BV_016(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE } @@ -4791,8 +4791,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := m_contentContainer_allOmit; - v_contentResponse.any_1[0].Container_optional.parentID := ?; + v_contentResponse.container_optional := m_contentContainer_allOmit; + v_contentResponse.container_optional.parentID := ?; f_CSE_DMR_RET_BV_016(int3, m_createContainerBase, v_contentResponse);//Container } @@ -4801,8 +4801,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := m_contentGroup_allOmit; - v_contentResponse.any_1[0].Group_optional.parentID := ?; + v_contentResponse.group_optional := m_contentGroup_allOmit; + v_contentResponse.group_optional.parentID := ?; f_CSE_DMR_RET_BV_016(int9, m_createGroupBase, v_contentResponse);//Group } @@ -4811,8 +4811,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := m_contentSchedule_allOmit; - v_contentResponse.any_1[0].Schedule_optional.parentID := ?; + v_contentResponse.schedule_optional := m_contentSchedule_allOmit; + v_contentResponse.schedule_optional.parentID := ?; f_CSE_DMR_RET_BV_016(int18, m_createScheduleBase, v_contentResponse);//Schedule } @@ -4821,8 +4821,8 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := m_contentSubscription_allOmit; - v_contentResponse.any_1[0].Subscription_optional.parentID := ?; + v_contentResponse.subscription_optional := m_contentSubscription_allOmit; + v_contentResponse.subscription_optional.parentID := ?; f_CSE_DMR_RET_BV_016(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -4891,9 +4891,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AccessControlPolicy_optional := m_contentAcp_allOmit; - v_contentResponse.any_1[0].AccessControlPolicy_optional.parentID := ?; - v_contentResponse.any_1[0].AccessControlPolicy_optional.creationTime := ?; + v_contentResponse.accessControlPolicy_optional := m_contentAcp_allOmit; + v_contentResponse.accessControlPolicy_optional.parentID := ?; + v_contentResponse.accessControlPolicy_optional.creationTime := ?; f_CSE_DMR_RET_BV_017(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } @@ -4902,9 +4902,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AE_optional := m_contentAe_allOmit; - v_contentResponse.any_1[0].AE_optional.parentID := ?; - v_contentResponse.any_1[0].AE_optional.creationTime := ?; + v_contentResponse.aE_optional := m_contentAe_allOmit; + v_contentResponse.aE_optional.parentID := ?; + v_contentResponse.aE_optional.creationTime := ?; f_CSE_DMR_RET_BV_017(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE } @@ -4913,9 +4913,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := m_contentContainer_allOmit; - v_contentResponse.any_1[0].Container_optional.parentID := ?; - v_contentResponse.any_1[0].Container_optional.creationTime := ?; + v_contentResponse.container_optional := m_contentContainer_allOmit; + v_contentResponse.container_optional.parentID := ?; + v_contentResponse.container_optional.creationTime := ?; f_CSE_DMR_RET_BV_017(int3, m_createContainerBase, v_contentResponse);//Container } @@ -4924,9 +4924,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Group_optional := m_contentGroup_allOmit; - v_contentResponse.any_1[0].Group_optional.parentID := ?; - v_contentResponse.any_1[0].Group_optional.creationTime := ?; + v_contentResponse.group_optional := m_contentGroup_allOmit; + v_contentResponse.group_optional.parentID := ?; + v_contentResponse.group_optional.creationTime := ?; f_CSE_DMR_RET_BV_017(int9, m_createGroupBase, v_contentResponse);//Group } @@ -4935,9 +4935,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Schedule_optional := m_contentSchedule_allOmit; - v_contentResponse.any_1[0].Schedule_optional.parentID := ?; - v_contentResponse.any_1[0].Schedule_optional.creationTime := ?; + v_contentResponse.schedule_optional := m_contentSchedule_allOmit; + v_contentResponse.schedule_optional.parentID := ?; + v_contentResponse.schedule_optional.creationTime := ?; f_CSE_DMR_RET_BV_017(int18, m_createScheduleBase, v_contentResponse);//Schedule } @@ -4946,9 +4946,9 @@ module OneM2M_Testcases { // Local variables var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Subscription_optional := m_contentSubscription_allOmit; - v_contentResponse.any_1[0].Subscription_optional.parentID := ?; - v_contentResponse.any_1[0].Subscription_optional.creationTime := ?; + v_contentResponse.subscription_optional := m_contentSubscription_allOmit; + v_contentResponse.subscription_optional.parentID := ?; + v_contentResponse.subscription_optional.creationTime := ?; f_CSE_DMR_RET_BV_017(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } @@ -5216,8 +5216,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_createRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_2; + v_createRequest.primitiveContent.container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_2; v_responsePrimitive := f_CSE_DMR_UPD_BV_001(int3, v_createRequest, v_updateRequest);//Container @@ -5225,8 +5225,8 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels != v_labels_2){ + if(ischosen(v_responsePrimitive.primitiveContent.container_optional)) { + if(v_responsePrimitive.primitiveContent.container_optional.labels != v_labels_2){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5242,16 +5242,16 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_2; + v_createRequest.primitiveContent.group_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.group_optional.labels := v_labels_2; v_responsePrimitive := f_CSE_DMR_UPD_BV_001(int9, v_createRequest, v_updateRequest);//Group if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels != v_labels_2){ + if(ischosen(v_responsePrimitive.primitiveContent.group_optional)) { + if(v_responsePrimitive.primitiveContent.group_optional.labels != v_labels_2){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5267,16 +5267,16 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_2; + v_createRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_2; v_responsePrimitive := f_CSE_DMR_UPD_BV_001(int1, v_createRequest, v_updateRequest);//ACP if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy)) { - if(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels != v_labels_2){ + if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy_optional)) { + if(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.labels != v_labels_2){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5293,16 +5293,16 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateScheduleBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_2; + v_createRequest.primitiveContent.schedule_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.schedule_optional.labels := v_labels_2; v_responsePrimitive := f_CSE_DMR_UPD_BV_001(int18, v_createRequest, v_updateRequest);//Schedule if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels != v_labels_2){ + if(ischosen(v_responsePrimitive.primitiveContent.schedule_optional)) { + if(v_responsePrimitive.primitiveContent.schedule_optional.labels != v_labels_2){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5319,16 +5319,16 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_2; + v_createRequest.primitiveContent.pollingChannel_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.pollingChannel_optional.labels := v_labels_2; v_responsePrimitive := f_CSE_DMR_UPD_BV_001(int15, v_createRequest, v_updateRequest);//PollingChannel if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels != v_labels_2){ + if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel_optional)) { + if(v_responsePrimitive.primitiveContent.pollingChannel_optional.labels != v_labels_2){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5344,16 +5344,16 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_2; + v_createRequest.primitiveContent.subscription_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.subscription_optional.labels := v_labels_2; v_responsePrimitive := f_CSE_DMR_UPD_BV_001(int23, v_createRequest, v_updateRequest);//Subscription if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels != v_labels_2){ + if(ischosen(v_responsePrimitive.primitiveContent.subscription_optional)) { + if(v_responsePrimitive.primitiveContent.subscription_optional.labels != v_labels_2){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5425,15 +5425,15 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateContainerBase; var ResponsePrimitive v_responsePrimitive; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; v_responsePrimitive := f_CSE_DMR_UPD_BV_002(int3, m_createContainerBase, v_updateRequest);//Container if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels != v_labels_1){ + if(ischosen(v_responsePrimitive.primitiveContent.container_optional)) { + if(v_responsePrimitive.primitiveContent.container_optional.labels != v_labels_1){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5447,15 +5447,15 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; - v_updateRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.group_optional.labels := v_labels_1; v_responsePrimitive := f_CSE_DMR_UPD_BV_002(int9, m_createGroupBase, v_updateRequest);//Group if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels != v_labels_1){ + if(ischosen(v_responsePrimitive.primitiveContent.group_optional)) { + if(v_responsePrimitive.primitiveContent.group_optional.labels != v_labels_1){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5469,15 +5469,15 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_1; v_responsePrimitive := f_CSE_DMR_UPD_BV_002(int1, m_createAcpBase,v_updateRequest);//AccessControlPolicy if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels != v_labels_1){ + if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy_optional)) { + if(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.labels != v_labels_1){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5491,15 +5491,15 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateScheduleBase; var ResponsePrimitive v_responsePrimitive; - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.schedule_optional.labels := v_labels_1; v_responsePrimitive := f_CSE_DMR_UPD_BV_002(int18, m_createScheduleBase,v_updateRequest);//Schedule if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels != v_labels_1){ + if(ischosen(v_responsePrimitive.primitiveContent.schedule_optional)) { + if(v_responsePrimitive.primitiveContent.schedule_optional.labels != v_labels_1){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5513,15 +5513,15 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var ResponsePrimitive v_responsePrimitive; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.pollingChannel_optional.labels := v_labels_1; v_responsePrimitive := f_CSE_DMR_UPD_BV_002(int15, m_createPollingChannelBase,v_updateRequest);//PollingChannel if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels != v_labels_1){ + if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel_optional)) { + if(v_responsePrimitive.primitiveContent.pollingChannel_optional.labels != v_labels_1){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5535,15 +5535,15 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.subscription_optional.labels := v_labels_1; v_responsePrimitive := f_CSE_DMR_UPD_BV_002(int23, m_createSubscriptionBase,v_updateRequest);//Subscription if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) { - if(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels != v_labels_1){ + if(ischosen(v_responsePrimitive.primitiveContent.subscription_optional)) { + if(v_responsePrimitive.primitiveContent.subscription_optional.labels != v_labels_1){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } } @@ -5617,8 +5617,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_createRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_2; + v_createRequest.primitiveContent.container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -5627,9 +5627,9 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) { - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels)){ - if(not(match(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels,{""}))) { + if(ischosen(v_responsePrimitive.primitiveContent.container_optional)) { + if(ispresent(v_responsePrimitive.primitiveContent.container_optional.labels)){ + if(not(match(v_responsePrimitive.primitiveContent.container_optional.labels,{""}))) { setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly"); } } @@ -5647,8 +5647,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createGroupBase; var template RequestPrimitive v_updateRequest := m_updateGroupBase; - v_createRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_2; + v_createRequest.primitiveContent.group_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.group_optional.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -5657,8 +5657,8 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) { - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels)){ + if(ischosen(v_responsePrimitive.primitiveContent.group_optional)) { + if(ispresent(v_responsePrimitive.primitiveContent.group_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5675,8 +5675,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createAcpBase; var template RequestPrimitive v_updateRequest := m_updateAcpBase; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_2; + v_createRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -5685,8 +5685,8 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional)) { - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels)){ + if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy_optional)) { + if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5703,8 +5703,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createScheduleBase; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; - v_createRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_2; + v_createRequest.primitiveContent.schedule_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.schedule_optional.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -5713,8 +5713,8 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) { - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels)){ + if(ischosen(v_responsePrimitive.primitiveContent.schedule_optional)) { + if(ispresent(v_responsePrimitive.primitiveContent.schedule_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5731,8 +5731,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createPollingChannelBase; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; - v_createRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_2; + v_createRequest.primitiveContent.pollingChannel_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.pollingChannel_optional.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -5741,8 +5741,8 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) { - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels)){ + if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel_optional)) { + if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5759,8 +5759,8 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_1; - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_2; + v_createRequest.primitiveContent.subscription_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.subscription_optional.labels := v_labels_2; v_nullFields := {{"labels", omit}}; @@ -5769,8 +5769,8 @@ module OneM2M_Testcases { if(getverdict == pass){ //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) { - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels)){ + if(ischosen(v_responsePrimitive.primitiveContent.subscription_optional)) { + if(ispresent(v_responsePrimitive.primitiveContent.subscription_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5846,10 +5846,10 @@ module OneM2M_Testcases { var ResponsePrimitive v_responsePrimitive; var AttributeAux_list v_nullFields; - v_createRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;//Attribute 3 - v_updateRequest.primitiveContent.any_1[0].Container_optional.expirationTime := "20301231T012345";//Attribute 1 - v_updateRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances := 5;//Attribute 2 - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_2;//Attribute 3 + v_createRequest.primitiveContent.container_optional.labels := v_labels_1;//Attribute 3 + v_updateRequest.primitiveContent.container_optional.expirationTime := "20301231T012345";//Attribute 1 + v_updateRequest.primitiveContent.container_optional.maxNrOfInstances := 5;//Attribute 2 + v_updateRequest.primitiveContent.container_optional.labels := v_labels_2;//Attribute 3 v_nullFields := {{"labels", omit}}; @@ -5857,17 +5857,17 @@ module OneM2M_Testcases { if(getverdict == pass){ if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Container_optional)) { + if(ischosen(v_responsePrimitive.primitiveContent.container_optional)) { //Check attribute 1 - if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.expirationTime != valueof(v_updateRequest.primitiveContent.any_1[0].Container_optional.expirationTime)){ + if(v_responsePrimitive.primitiveContent.container_optional.expirationTime != valueof(v_updateRequest.primitiveContent.container_optional.expirationTime)){ setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly") } //Check attribute 2 - if(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.any_1[0].Container_optional.maxNrOfInstances)){ + if(v_responsePrimitive.primitiveContent.container_optional.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.container_optional.maxNrOfInstances)){ setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly") } //Check attribute 3 - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Container_optional.labels)){ + if(ispresent(v_responsePrimitive.primitiveContent.container_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5886,10 +5886,10 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateGroupBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_1;//Attribute 3 - v_updateRequest.primitiveContent.any_1[0].Group_optional.expirationTime := "20301231T012345";//Attribute 1 - v_updateRequest.primitiveContent.any_1[0].Group_optional.groupName:= v_groupName_1;//Attribute 2 - v_updateRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_2;//Attribute 3 + v_createRequest.primitiveContent.group_optional.labels := v_labels_1;//Attribute 3 + v_updateRequest.primitiveContent.group_optional.expirationTime := "20301231T012345";//Attribute 1 + v_updateRequest.primitiveContent.group_optional.groupName:= v_groupName_1;//Attribute 2 + v_updateRequest.primitiveContent.group_optional.labels := v_labels_2;//Attribute 3 v_nullFields := {{"labels", omit}}; @@ -5897,17 +5897,17 @@ module OneM2M_Testcases { if(getverdict == pass){ if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Group_optional)) { + if(ischosen(v_responsePrimitive.primitiveContent.group_optional)) { //Check attribute 1 - if(not match(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.groupName, valueof(v_updateRequest.primitiveContent.any_1[0].Group_optional.groupName))){ + if(not match(v_responsePrimitive.primitiveContent.group_optional.groupName, valueof(v_updateRequest.primitiveContent.group_optional.groupName))){ setverdict(fail, testcasename() & ": Error: groupName attribute not updated correctly") } //Check attribute 2 - if(not match(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.expirationTime, valueof(v_updateRequest.primitiveContent.any_1[0].Group_optional.expirationTime))){ + if(not match(v_responsePrimitive.primitiveContent.group_optional.expirationTime, valueof(v_updateRequest.primitiveContent.group_optional.expirationTime))){ setverdict(fail, testcasename() & ": Error: expirationTime attribute not updated correctly") } //Check attribute 3 - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Group_optional.labels)){ + if(ispresent(v_responsePrimitive.primitiveContent.group_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5935,10 +5935,10 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_1;//Attribute 3 - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges := v_privileges_2; //Attribute 1 - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2 - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_2;//Attribute 3 + v_createRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_1;//Attribute 3 + v_updateRequest.primitiveContent.accessControlPolicy_optional.privileges := v_privileges_2; //Attribute 1 + v_updateRequest.primitiveContent.accessControlPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2 + v_updateRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_2;//Attribute 3 v_nullFields := {{"labels", omit}}; @@ -5946,17 +5946,17 @@ module OneM2M_Testcases { if(getverdict == pass){ if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional)) { + if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy_optional)) { //Check attribute 1 - if(not match(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list[0].accessControlOperations, v_privileges_2.accessControlRule_list[0].accessControlOperations)){ + if(not match(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.privileges.accessControlRule_list[0].accessControlOperations, v_privileges_2.accessControlRule_list[0].accessControlOperations)){ setverdict(fail, testcasename() & ": Error: Privileges attribute not updated correctly") } //Check attribute 2 - if(not match(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo, valueof(v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.announceTo))){ + if(not match(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.announceTo, valueof(v_updateRequest.primitiveContent.accessControlPolicy_optional.announceTo))){ setverdict(fail, testcasename() & ": Error: Announce_to attribute not updated correctly") } //Check attribute 3 - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.labels)){ + if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -5973,10 +5973,10 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateScheduleBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Schedule_optional.scheduleElement := {{"0,0,0 1 2,1,1,*"}};//Attribute 1 - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.scheduleElement := {{"1,1,1 1 2,1,1,*"}}; //Attribute 1 - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2 - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_2;//Attribute 3 + v_createRequest.primitiveContent.schedule_optional.scheduleElement := {{"0,0,0 1 2,1,1,*"}};//Attribute 1 + v_updateRequest.primitiveContent.schedule_optional.scheduleElement := {{"1,1,1 1 2,1,1,*"}}; //Attribute 1 + v_updateRequest.primitiveContent.schedule_optional.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2 + v_updateRequest.primitiveContent.schedule_optional.labels := v_labels_2;//Attribute 3 v_nullFields := {{"labels", omit}}; @@ -5984,17 +5984,17 @@ module OneM2M_Testcases { if(getverdict == pass){ if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional)) { + if(ischosen(v_responsePrimitive.primitiveContent.schedule_optional)) { //Check attribute 1 - if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.scheduleElement != valueof(v_updateRequest.primitiveContent.any_1[0].Schedule_optional.scheduleElement)){ + if(v_responsePrimitive.primitiveContent.schedule_optional.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule_optional.scheduleElement)){ setverdict(fail, testcasename() & ": Error: Expiration Time attribute not updated correctly") } //Check attribute 2 - if(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.announceTo != valueof(v_updateRequest.primitiveContent.any_1[0].Schedule_optional.announceTo)){ + if(v_responsePrimitive.primitiveContent.schedule_optional.announceTo != valueof(v_updateRequest.primitiveContent.schedule_optional.announceTo)){ setverdict(fail, testcasename() & ": Error: MaxNrOfInstances attribute not updated correctly") } //Check attribute 3 - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Schedule_optional.labels)){ + if(ispresent(v_responsePrimitive.primitiveContent.schedule_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -6012,10 +6012,10 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1;//Attribute 3 + v_createRequest.primitiveContent.pollingChannel_optional.labels := v_labels_1;//Attribute 3 //No Attribute 1 - //v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2 - v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_2;//Attribute 3 + //v_updateRequest.primitiveContent.pollingChannel_optional.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2 + v_updateRequest.primitiveContent.pollingChannel_optional.labels := v_labels_2;//Attribute 3 v_nullFields := {{"labels", omit}}; @@ -6023,15 +6023,15 @@ module OneM2M_Testcases { if(getverdict == pass){ if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) { + if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel_optional)) { //Check attribute 1 //Check attribute 2 TODO once another alternative is found, activate this checking - /*if(not match(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs))){ + /*if(not match(v_responsePrimitive.primitiveContent.pollingChannel_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.pollingChannel_optional.accessControlPolicyIDs))){ setverdict(fail, testcasename() & ": Error: ACPI attribute not added correctly") }*/ //Check attribute 3 - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels)){ + if(ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.labels)){ setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly") } } @@ -6047,10 +6047,10 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var ResponsePrimitive v_responsePrimitive; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationCounter := 10;//Attribute 3 - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.expirationTime := "20301231T012345";//Attribute 1 - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_1;//Attribute 2 - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.expirationCounter := 5;//Attribute 3 + v_createRequest.primitiveContent.subscription_optional.expirationCounter := 10;//Attribute 3 + v_updateRequest.primitiveContent.subscription_optional.expirationTime := "20301231T012345";//Attribute 1 + v_updateRequest.primitiveContent.subscription_optional.labels := v_labels_1;//Attribute 2 + v_updateRequest.primitiveContent.subscription_optional.expirationCounter := 5;//Attribute 3 v_nullFields := {{"expirationCounter", omit}}; @@ -6058,17 +6058,17 @@ module OneM2M_Testcases { if(getverdict == pass){ if(ispresent(v_responsePrimitive.primitiveContent)) { - if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional)) { + if(ischosen(v_responsePrimitive.primitiveContent.subscription_optional)) { //Check attribute 1 - if(not match(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.labels, valueof(v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels))){ + if(not match(v_responsePrimitive.primitiveContent.subscription_optional.labels, valueof(v_updateRequest.primitiveContent.subscription_optional.labels))){ setverdict(fail, testcasename() & ": Error: Labels attribute not updated correctly") } //Check attribute 2 - if(not match(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.expirationTime, valueof(v_updateRequest.primitiveContent.any_1[0].Subscription_optional.expirationTime))){ + if(not match(v_responsePrimitive.primitiveContent.subscription_optional.expirationTime, valueof(v_updateRequest.primitiveContent.subscription_optional.expirationTime))){ setverdict(fail, testcasename() & ": Error: expirationTime attribute not updated correctly") } //Check attribute 3 - if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].Subscription_optional.expirationCounter)){ + if(ispresent(v_responsePrimitive.primitiveContent.subscription_optional.expirationCounter)){ setverdict(fail, testcasename() & ": Error: expirationCounter attribute not deleted correctly") } } @@ -6138,9 +6138,9 @@ module OneM2M_Testcases { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_updateRequest.primitiveContent.any_1 := {{Container_update_invalid := m_contentUpdateContainer_invalid}}; + v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid}; - v_updateRequest.primitiveContent.any_1[0].Container_update_invalid.expirationCounter := v_expirationCounter; + v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter; f_CSE_DMR_UPD_BI_005(int3, m_createContainerBase, v_updateRequest);//Container } @@ -6150,9 +6150,9 @@ module OneM2M_Testcases { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateGroupBase; - v_updateRequest.primitiveContent.any_1 := {{Group_update_invalid := m_contentUpdateGroup_invalid}}; + v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid}; - v_updateRequest.primitiveContent.any_1[0].Group_update_invalid.expirationCounter := v_expirationCounter; + v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter; f_CSE_DMR_UPD_BI_005(int9, m_createGroupBase, v_updateRequest);//Group } @@ -6162,9 +6162,9 @@ module OneM2M_Testcases { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateAcpBase; - v_updateRequest.primitiveContent.any_1 := {{ACP_update_invalid := m_contentUpdateAcp_invalid}}; + v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid}; - v_updateRequest.primitiveContent.any_1[0].ACP_update_invalid.expirationCounter := v_expirationCounter; + v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter; f_CSE_DMR_UPD_BI_005(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy } @@ -6174,9 +6174,9 @@ module OneM2M_Testcases { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; - v_updateRequest.primitiveContent.any_1 := {{Schedule_update_invalid := m_contentUpdateSchedule_invalid}}; + v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid}; - v_updateRequest.primitiveContent.any_1[0].Schedule_update_invalid.expirationCounter := v_expirationCounter; + v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter; f_CSE_DMR_UPD_BI_005(int18, m_createScheduleBase, v_updateRequest);//Schedule } @@ -6186,9 +6186,9 @@ module OneM2M_Testcases { var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; - v_updateRequest.primitiveContent.any_1 := {{PollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}}; + v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_update_invalid.expirationCounter := v_expirationCounter; + v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter; f_CSE_DMR_UPD_BI_005(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel } @@ -6198,9 +6198,9 @@ module OneM2M_Testcases { var XSD.NonNegativeInteger v_maxNrOfInstances := 5; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; - v_updateRequest.primitiveContent.any_1 := {{Subscription_update_invalid := m_contentUpdateSubscription_invalid}}; + v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid}; - v_updateRequest.primitiveContent.any_1[0].Subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances; + v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances; f_CSE_DMR_UPD_BI_005(int23, m_createSubscriptionBase, v_updateRequest);//Subscription } @@ -6264,7 +6264,7 @@ module OneM2M_Testcases { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_DMR_UPD_BO_006(int3, m_createContainerBase, v_updateRequest);//Container } @@ -6274,7 +6274,7 @@ module OneM2M_Testcases { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; - v_updateRequest.primitiveContent.any_1[0].Group_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.group_optional.labels := v_labels_1; f_CSE_DMR_UPD_BO_006(int9, m_createGroupBase, v_updateRequest);//Group } @@ -6285,9 +6285,9 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateAcpBase; var template RequestPrimitive v_requestPrimitive := m_createAcpBase; - v_requestPrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59; + v_requestPrimitive.primitiveContent.accessControlPolicy_optional.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59; - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.accessControlPolicy_optional.labels := v_labels_1; f_CSE_DMR_UPD_BO_006(int1, v_requestPrimitive, v_updateRequest);//AccessControlPolicy } @@ -6297,7 +6297,7 @@ module OneM2M_Testcases { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.schedule_optional.labels := v_labels_1; f_CSE_DMR_UPD_BO_006(int18, m_createScheduleBase, v_updateRequest);//Schedule } @@ -6307,7 +6307,7 @@ module OneM2M_Testcases { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.pollingChannel_optional.labels := v_labels_1; f_CSE_DMR_UPD_BO_006(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel } @@ -6317,7 +6317,7 @@ module OneM2M_Testcases { var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.subscription_optional.labels := v_labels_1; f_CSE_DMR_UPD_BO_006(int23, m_createSubscriptionBase, v_updateRequest);//Subscription } @@ -6394,8 +6394,8 @@ module OneM2M_Testcases { var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; - v_updateRequest.primitiveContent.any_1 := {{Container_update_invalid := m_contentUpdateContainer_invalid}}; - v_updateRequest.primitiveContent.any_1[0].Container_update_invalid.creationTime := v_creationTime; + v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid}; + v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime; f_CSE_DMR_UPD_BO_007(int3, m_createContainerBase, v_updateRequest);//Container } @@ -6405,8 +6405,8 @@ module OneM2M_Testcases { var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateGroupBase; - v_updateRequest.primitiveContent.any_1 := {{Group_update_invalid := m_contentUpdateGroup_invalid}}; - v_updateRequest.primitiveContent.any_1[0].Group_update_invalid.creationTime := v_creationTime; + v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid}; + v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime; f_CSE_DMR_UPD_BO_007(int9, m_createGroupBase, v_updateRequest);//Group } @@ -6416,8 +6416,8 @@ module OneM2M_Testcases { var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateAcpBase; - v_updateRequest.primitiveContent.any_1 := {{ACP_update_invalid := m_contentUpdateAcp_invalid}}; - v_updateRequest.primitiveContent.any_1[0].ACP_update_invalid.creationTime := v_creationTime; + v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid}; + v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime; f_CSE_DMR_UPD_BO_007(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy } @@ -6427,8 +6427,8 @@ module OneM2M_Testcases { var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; - v_updateRequest.primitiveContent.any_1 := {{Schedule_update_invalid := m_contentUpdateSchedule_invalid}}; - v_updateRequest.primitiveContent.any_1[0].Schedule_update_invalid.creationTime := v_creationTime; + v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid}; + v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime; f_CSE_DMR_UPD_BO_007(int18, m_createScheduleBase, v_updateRequest);//Schedule } @@ -6438,8 +6438,8 @@ module OneM2M_Testcases { var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; - v_updateRequest.primitiveContent.any_1 := {{PollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}}; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_update_invalid.creationTime := v_creationTime; + v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid}; + v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime; f_CSE_DMR_UPD_BO_007(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel } @@ -6449,8 +6449,8 @@ module OneM2M_Testcases { var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; - v_updateRequest.primitiveContent.any_1 := {{Subscription_update_invalid := m_contentUpdateSubscription_invalid}}; - v_updateRequest.primitiveContent.any_1[0].Subscription_update_invalid.creationTime := v_creationTime; + v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid}; + v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime; f_CSE_DMR_UPD_BO_007(int23, m_createSubscriptionBase, v_updateRequest);//Subscription } @@ -6522,7 +6522,7 @@ module OneM2M_Testcases { v_nullFields := {{"expirationTime", omit}}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.expirationTime := v_expirationTime; + v_updateRequest.primitiveContent.container_optional.expirationTime := v_expirationTime; f_CSE_DMR_UPD_BO_008(int3, m_createContainerBase, v_updateRequest, v_nullFields);//Container } @@ -6535,7 +6535,7 @@ module OneM2M_Testcases { v_nullFields := {{"expirationTime", omit}}; - v_updateRequest.primitiveContent.any_1[0].Group_optional.expirationTime := v_expirationTime; + v_updateRequest.primitiveContent.group_optional.expirationTime := v_expirationTime; f_CSE_DMR_UPD_BO_008(int9, m_createGroupBase, v_updateRequest, v_nullFields);//Group } @@ -6548,7 +6548,7 @@ module OneM2M_Testcases { v_nullFields := {{"expirationTime", omit}}; - v_updateRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.expirationTime := v_expirationTime; + v_updateRequest.primitiveContent.accessControlPolicy_optional.expirationTime := v_expirationTime; f_CSE_DMR_UPD_BO_008(int1, m_createAcpBase, v_updateRequest, v_nullFields);//AccessControlPolicy } @@ -6561,7 +6561,7 @@ module OneM2M_Testcases { v_nullFields := {{"expirationTime", omit}}; - v_updateRequest.primitiveContent.any_1[0].Schedule_optional.expirationTime := v_expirationTime; + v_updateRequest.primitiveContent.schedule_optional.expirationTime := v_expirationTime; f_CSE_DMR_UPD_BO_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields);//Schedule } @@ -6574,7 +6574,7 @@ module OneM2M_Testcases { v_nullFields := {{"expirationTime", omit}}; - v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.expirationTime := v_expirationTime; + v_updateRequest.primitiveContent.pollingChannel_optional.expirationTime := v_expirationTime; f_CSE_DMR_UPD_BO_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields);//PollingChannel } @@ -6587,7 +6587,7 @@ module OneM2M_Testcases { v_nullFields := {{"expirationTime", omit}}; - v_updateRequest.primitiveContent.any_1[0].Subscription_optional.expirationTime := v_expirationTime; + v_updateRequest.primitiveContent.subscription_optional.expirationTime := v_expirationTime; f_CSE_DMR_UPD_BO_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields);//Subscription } @@ -6657,7 +6657,7 @@ module OneM2M_Testcases { var integer v_containerIndex := -1; var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase); var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; // Test control @@ -6672,7 +6672,7 @@ module OneM2M_Testcases { v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); // Test Body - if(ispresent(vc_resourcesList[v_containerIndex].resource.any_1[0].Container_optional.stateTag)) { + if(ispresent(vc_resourcesList[v_containerIndex].resource.container_optional.stateTag)) { v_updateRequest := f_getUpdateRequestPrimitive(int3, v_containerIndex, v_updateRequest); f_cse_updateResource(v_updateRequest); @@ -6683,7 +6683,7 @@ module OneM2M_Testcases { alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Container_optional.stateTag == 1) { //(Create and Delete) + if(v_response.primitive.responsePrimitive.primitiveContent.container_optional.stateTag == 1) { //(Create and Delete) setverdict(pass, testcasename() & ": The stateTag attribute is incremented"); } else{ @@ -6726,7 +6726,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase; var Labels v_labels:= {"LABEL"}; - v_updateRequest.primitiveContent.any_1[0].ContentInstance_optional.labels := v_labels; + v_updateRequest.primitiveContent.contentInstance_optional.labels := v_labels; // Test control @@ -6787,7 +6787,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase; var Labels v_labels := {"LABEL"}; - v_updateRequest.primitiveContent.any_1[0].ContentInstance_optional.labels := v_labels; + v_updateRequest.primitiveContent.contentInstance_optional.labels := v_labels; // Test control @@ -6850,7 +6850,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase; var Labels v_labels:= {"LABEL"}; - v_updateRequest.primitiveContent.any_1[0].ContentInstance_optional.labels := v_labels; + v_updateRequest.primitiveContent.contentInstance_optional.labels := v_labels; // Test control @@ -7096,7 +7096,7 @@ module OneM2M_Testcases { //Adjustments for ACP resource type if(p_resourceType == int1) { - p_createRequestPrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list := {v_accessControlRule_2};//{v_accessControlRule_1,v_accessControlRule_2}; + p_createRequestPrimitive.primitiveContent.accessControlPolicy_optional.selfPrivileges.accessControlRule_list := {v_accessControlRule_2};//{v_accessControlRule_1,v_accessControlRule_2}; } else { f_setAcpId(p_createRequestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}); v_setOfArcs.accessControlRule_list := {v_accessControlRule_1, v_accessControlRule_2}; @@ -7336,7 +7336,7 @@ module OneM2M_Testcases { v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex); - if(ispresent(vc_resourcesList[v_resourceIndex].resource.any_1[0].Container_optional.stateTag)) { + if(ispresent(vc_resourcesList[v_resourceIndex].resource.container_optional.stateTag)) { v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); @@ -7367,7 +7367,7 @@ module OneM2M_Testcases { alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Container_optional.stateTag == 2) { //(Create and Delete) + if(v_response.primitive.responsePrimitive.primitiveContent.container_optional.stateTag == 2) { //(Create and Delete) setverdict(pass, testcasename() & ": The stateTag attribute is incremented"); } else{ @@ -7424,7 +7424,7 @@ module OneM2M_Testcases { v_attributesContainer := f_cse_retrieveResource(v_containerIndex); - if(not(ispresent(v_attributesContainer.any_1[0].Container_optional.currentNrOfInstances))) { + if(not(ispresent(v_attributesContainer.container_optional.currentNrOfInstances))) { setverdict(fail, testcasename() & ": Error the currentNrOfInstances attribute is empty"); f_checkCseTesterStatus(); } @@ -7434,13 +7434,13 @@ module OneM2M_Testcases { v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex); - if(not(ispresent(v_attributesContainer.any_1[0].Container_optional.currentNrOfInstances))) { + if(not(ispresent(v_attributesContainer.container_optional.currentNrOfInstances))) { setverdict(fail, testcasename() & ": Error the currentNrOfInstances attribute is empty"); f_checkCseTesterStatus(); } - if((v_attributesContainer.any_1[0].Container_optional.currentNrOfInstances > v_attributesContainer_afterDeletion.any_1[0].Container_optional.currentNrOfInstances) and - (v_attributesContainer.any_1[0].Container_optional.currentByteSize > v_attributesContainer_afterDeletion.any_1[0].Container_optional.currentByteSize)) { + if((v_attributesContainer.container_optional.currentNrOfInstances > v_attributesContainer_afterDeletion.container_optional.currentNrOfInstances) and + (v_attributesContainer.container_optional.currentByteSize > v_attributesContainer_afterDeletion.container_optional.currentByteSize)) { setverdict(pass, testcasename() & ": The currentNrOfInstances and currentByteSize attributes are decreased"); } else { setverdict(fail, testcasename() & ": currentNrOfInstances and/or currentByteSize attributes are not decreased"); @@ -8000,7 +8000,7 @@ module OneM2M_Testcases { alt{ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ tc_ac.stop; - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Container_optional.locationID)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.container_optional.locationID)){ setverdict(fail, testcasename() & "No locationID is included in the response!"); }else{ setverdict(pass, testcasename() & "Container resource associated with locationPolicy resource is successfully retrieved with locationID included in the response!"); @@ -8166,7 +8166,7 @@ module OneM2M_Testcases { alt{ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ tc_ac.stop; - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Notification.notificationEvent)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){ setverdict(fail, testcasename() & "No NotificationEvent is included in the response!"); }else{ setverdict(pass, testcasename() & "Location information is successfully sent!"); @@ -8229,7 +8229,7 @@ module OneM2M_Testcases { alt{ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ tc_ac.stop; - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Notification.notificationEvent)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){ setverdict(fail, testcasename() & "No NotificationEvent is included in the response!"); }else{ setverdict(pass, testcasename() & "Location information is successfully sent!"); @@ -8291,7 +8291,7 @@ module OneM2M_Testcases { alt{ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ tc_ac.stop; - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Notification.notificationEvent)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.notification.notificationEvent)){ setverdict(fail, testcasename() & "No NotificationEvent is included in the response!"); }else{ setverdict(pass, testcasename() & "Location information is successfully sent!"); @@ -8418,7 +8418,7 @@ module OneM2M_Testcases { alt{ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ tc_ac.stop; - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].LocationPolicy_optional.locationContainerID)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.locationPolicy_optional.locationContainerID)){ setverdict(fail, testcasename() & "No locationContainerID is included in the response!"); }else{ setverdict(pass, testcasename() & "LocationPolicy resource is successfully retrieved with locationContainerID included in the response!"); @@ -8556,7 +8556,7 @@ module OneM2M_Testcases { v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource - v_containerCreateRequest.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}; + v_containerCreateRequest.primitiveContent.container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}; v_containerIndex := f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex); // AE child resource v_createRequest := m_createGroup(1, {f_getResourceId(vc_resourcesList[v_containerIndex].resource)}, omit, int3); @@ -8626,12 +8626,12 @@ module OneM2M_Testcases { // Preamble v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource - v_containerCreateRequest.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}; + v_containerCreateRequest.primitiveContent.container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}; v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource)}, omit, int3), v_aeIndex); - v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)}; + v_updateRequest.primitiveContent.group_optional.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)}; v_request := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); // creating group // Test Body @@ -8701,10 +8701,10 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": Resource created successfully"); - if(not match({v_memberID}, v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs)){ + if(not match({v_memberID}, v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs)){ setverdict(fail, testcasename(), ": Error, presence of duplicate member IDs "); } - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs) != 1) { + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs) != 1) { setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute"); } } @@ -8759,11 +8759,11 @@ module OneM2M_Testcases { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource created successfully"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){ + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated == false){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct"); } } @@ -8821,20 +8821,20 @@ module OneM2M_Testcases { setverdict(pass, testcasename() & ": Resource created successfully"); // check for memberTypeValidated - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated != false){ + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated != false){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct"); } } // check for memberType (MIXED) - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberType)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberType)){ setverdict(fail, testcasename(), ": Error, memberType attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberType != int0){ //Mixed is int0 in release 2 and int24 in release 1 + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberType != int0){ //Mixed is int0 in release 2 and int24 in release 1 setverdict(fail, testcasename(), ": Error, memberType attribute not correct"); } } @@ -8957,19 +8957,19 @@ module OneM2M_Testcases { setverdict(pass, testcasename() & ": Resource created successfully"); // check for memberTypeValidated - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){ + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated == false){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct"); } } // check for membersId - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs)){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != f_getResourceAddress(v_containerIndex)){ + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs[0] != f_getResourceAddress(v_containerIndex)){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct"); } } @@ -9023,7 +9023,7 @@ module OneM2M_Testcases { v_memberId_2 := f_getResourceId(vc_resourcesList[v_containerIndex_2].resource); v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1, v_memberId_2}, omit, int3), v_aeIndex); // AE child resource - v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_2, v_memberId_2}; + v_updateRequest.primitiveContent.group_optional.memberIDs := {v_memberId_2, v_memberId_2}; v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); //Test Body @@ -9035,14 +9035,14 @@ module OneM2M_Testcases { setverdict(pass, testcasename() & ": update successful"); // check for membersId - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs)){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not provided"); } else { - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs) != 1) { + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs) != 1) { setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute"); } - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != v_memberId_2){ + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs[0] != v_memberId_2){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct"); } } @@ -9089,7 +9089,7 @@ module OneM2M_Testcases { v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource)}, omit, int3), v_aeIndex); - v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)}; + v_updateRequest.primitiveContent.group_optional.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)}; v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); // Test Body @@ -9100,11 +9100,11 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": update successful"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)) { + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)) { setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false) { + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated == false) { setverdict(fail, testcasename(), ": Error, memberTypeValidated wrong value"); } } @@ -9156,7 +9156,7 @@ module OneM2M_Testcases { v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource); v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1}, omit, int3, int3), v_aeIndex); //Member type is set to Container (int3) and consistencyStrategy is set to MIXED (int3) - v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_1, v_memberId_2}; + v_updateRequest.primitiveContent.group_optional.memberIDs := {v_memberId_1, v_memberId_2}; v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); // Test Body @@ -9168,21 +9168,21 @@ module OneM2M_Testcases { setverdict(pass, testcasename() & ": update successful"); //memberTypeValidated attribute set to FALSE - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)) { + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)) { setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated != false) { + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated != false) { setverdict(fail, testcasename(), ": Error, memberTypeValidated must be FALSE"); } } //memberType attribute set to MIXED - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberType)) { + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberType)) { setverdict(fail, testcasename(), ": Error, memberType attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberType != int0) { //Mixed is int0 in release 2 and int24 in release 1 + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberType != int0) { //Mixed is int0 in release 2 and int24 in release 1 setverdict(fail, testcasename(), ": Error, memberType was not set to MIXED"); } } @@ -9234,7 +9234,7 @@ module OneM2M_Testcases { v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource); v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1}, omit, int3, omit), v_aeIndex); //Member type is set to Container (int3) and consistencyStrategy is set to ABANDON MEMBER (default value) - v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_2, v_memberId_1}; + v_updateRequest.primitiveContent.group_optional.memberIDs := {v_memberId_2, v_memberId_1}; v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); //Test Body @@ -9247,24 +9247,24 @@ module OneM2M_Testcases { setverdict(pass, testcasename() & ": update successful"); //memberTypeValidated attribute set to TRUE - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)) { + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)) { setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated != true) { + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated != true) { setverdict(fail, testcasename(), ": Error, memberTypeValidated must be TRUE"); } } //memberIDs attribute set to v_memberID1 - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs)){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not provided"); } else { - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs) != 1) { + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs) != 1) { setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute"); } - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != v_memberId_1){ + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs[0] != v_memberId_1){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct"); } } @@ -9315,7 +9315,7 @@ module OneM2M_Testcases { v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource); v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1}, omit, int3, int2), v_aeIndex); //Member type is set to Container(int3) and consistencyStrategy is set to ABANDON GROUP (default value) - v_updateRequest.primitiveContent.any_1[0].Group_optional.memberIDs := {v_memberId_2, v_memberId_1}; + v_updateRequest.primitiveContent.group_optional.memberIDs := {v_memberId_2, v_memberId_1}; v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); //Test Body @@ -9388,7 +9388,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); v_memberIDs := v_memberIDs & {f_getResourceId(vc_resourcesList[v_containerIndex_3].resource)}; - v_request.primitiveContent.any_1[0].Group_optional.memberIDs := v_memberIDs; + v_request.primitiveContent.group_optional.memberIDs := v_memberIDs; mcaPort.send(m_request(v_request)); tc_ac.start; @@ -9428,7 +9428,7 @@ module OneM2M_Testcases { var ListOfURIs v_memberIDs; var XSD.PositiveInteger v_maxNrOfMembers:= 1; - v_updateRequest.primitiveContent.any_1[0].Group_optional.maxNrOfMembers := v_maxNrOfMembers; + v_updateRequest.primitiveContent.group_optional.maxNrOfMembers := v_maxNrOfMembers; // Test control @@ -9511,10 +9511,10 @@ module OneM2M_Testcases { // TODO: -> register IUT to the remoteCSE v_createRequest := f_getCreateRequestPrimitive(c_ResourceTypeGroup, v_createRequest, v_aeIndex); - v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(1, {c_memberResourceAddress1}, omit); - v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_memberType1; - v_createRequest.primitiveContent.any_1[0].Group_optional.memberTypeValidated := true; - v_createRequest.primitiveContent.any_1[0].Group_optional.consistencyStrategy := c_consistentcyStrategy; + v_createRequest.primitiveContent.group_optional := m_contentCreateGroup(1, {c_memberResourceAddress1}, omit); + v_createRequest.primitiveContent.group_optional.memberType := c_memberType1; + v_createRequest.primitiveContent.group_optional.memberTypeValidated := true; + v_createRequest.primitiveContent.group_optional.consistencyStrategy := c_consistentcyStrategy; v_groupIndex := f_cse_createResource(c_ResourceTypeGroup, v_createRequest, v_aeIndex); // TODO: -> do the resources actually need to be created? @@ -9529,7 +9529,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); // v_request.to_ := c_targetResourceAddress; - v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); + v_createRequest.primitiveContent.group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); mcaPort.send(m_request(v_request)); tc_ac.start; @@ -9537,14 +9537,14 @@ module OneM2M_Testcases { [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { tc_ac.stop; - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)) { + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated)) { setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false) { - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs) != 2) { + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberTypeValidated == false) { + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs) != 2) { setverdict(fail, testcasename() & ": Error, wrong number of memberIDs attribute"); } else { - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] == c_memberResourceAddress1 and v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[1] == c_memberResourceAddress2) { + if(v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs[0] == c_memberResourceAddress1 and v_response.primitive.responsePrimitive.primitiveContent.group_optional.memberIDs[1] == c_memberResourceAddress2) { setverdict(pass, testcasename() & ": update successful"); } else { setverdict(fail, testcasename(), ": Error, wrong memberIDs"); @@ -9610,10 +9610,10 @@ module OneM2M_Testcases { //v_remoteCSEIndex := ... v_createRequest := f_getCreateRequestPrimitive(c_ResourceTypeGroup, v_createRequest, v_aeIndex); - v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); - v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_memberType1; - v_createRequest.primitiveContent.any_1[0].Group_optional.memberTypeValidated := false; - v_createRequest.primitiveContent.any_1[0].Group_optional.consistencyStrategy := c_consistentcyStrategy; + v_createRequest.primitiveContent.group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); + v_createRequest.primitiveContent.group_optional.memberType := c_memberType1; + v_createRequest.primitiveContent.group_optional.memberTypeValidated := false; + v_createRequest.primitiveContent.group_optional.consistencyStrategy := c_consistentcyStrategy; v_groupIndex := f_cse_createResource(c_ResourceTypeGroup, v_createRequest, v_aeIndex); // TODO: -> the AE having a subscription to c_targetResourceAddress @@ -9668,7 +9668,7 @@ module OneM2M_Testcases { testcase TC_CSE_GMG_BV_018_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_GMG_BV_018(v_updateRequest); }//end TC_CSE_GMG_BV_018_02 @@ -9725,12 +9725,12 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided"); } else { - for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list); i := i+1){ - if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){ + for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){ + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){ setverdict(fail, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful"); } } @@ -9764,7 +9764,7 @@ module OneM2M_Testcases { testcase TC_CSE_GMG_BO_019_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_GMG_BO_019(v_updateRequest, int59);//c_CRDNDi }//end TC_CSE_GMG_BO_019_02 @@ -9856,7 +9856,7 @@ module OneM2M_Testcases { testcase TC_CSE_GMG_BV_020_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_GMG_BV_020(v_updateRequest); }//end TC_CSE_GMG_BV_020_02 @@ -9913,12 +9913,12 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided"); } else { - for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list); i := i+1){ - if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){ + for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){ + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){ setverdict(fail, testcasename(), ": Error, one responsePrimitve of aggregatedResponse_list is not successful"); } } @@ -9952,7 +9952,7 @@ module OneM2M_Testcases { testcase TC_CSE_GMG_BO_021_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_GMG_BO_021(v_updateRequest, int59);//c_CRDNDi }//end TC_CSE_GMG_BO_021_02 @@ -10039,7 +10039,7 @@ module OneM2M_Testcases { testcase TC_CSE_GMG_BV_022_01() runs on CseTester system CseSystem { //Create var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; + v_contentResponse.container_optional := mw_contentContainer_rc1; f_CSE_GMG_BV_022(m_createContainerBase, v_contentResponse); }//end TC_CSE_GMG_BV_022_01 @@ -10048,23 +10048,23 @@ module OneM2M_Testcases { var template RequestPrimitive v_updateRequest := m_updateAeBase; var template PrimitiveContent v_contentResponse; var Labels v_labels_1:= {"VALUE_1"}; - v_contentResponse.any_1[0].AE_optional := m_contentAe_allOmit; - v_contentResponse.any_1[0].AE_optional.labels := ?; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := m_contentAe_allOmit; + v_contentResponse.aE_optional.labels := ?; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; f_CSE_GMG_BV_022(v_updateRequest, v_contentResponse); }//end TC_CSE_GMG_BV_022_02 testcase TC_CSE_GMG_BV_022_03() runs on CseTester system CseSystem { //Retrieve var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; + v_contentResponse.aE_optional := mw_contentAeBase; f_CSE_GMG_BV_022(m_retrieveResource("Temporary", "Temporary"), v_contentResponse); }//end TC_CSE_GMG_BV_022_03 testcase TC_CSE_GMG_BV_022_04() runs on CseTester system CseSystem { //Delete var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase;// TODO see with wath should it be matched + v_contentResponse.aE_optional := mw_contentAeBase;// TODO see with wath should it be matched f_CSE_GMG_BV_022(m_deleteRequest("Temporary"), v_contentResponse); }//end TC_CSE_GMG_BV_022_04 @@ -10106,16 +10106,16 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided"); } else{ - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){ + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){ setverdict(fail, testcasename(), ": Error, length of aggregatedResponse is not valid"); } else{ for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){ - if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){ + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse doesn't match with template expected"); } } @@ -10157,7 +10157,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -); var template PrimitiveContent v_contentResponse; - v_contentResponse.any_1[0].ContentInstance_optional := mw_contentContentInstanceBase; + v_contentResponse.contentInstance_optional := mw_contentContentInstanceBase; // Test control if(not(PICS_ACP_SUPPORT)) { @@ -10192,16 +10192,16 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided"); } else{ - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){ + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){ setverdict(fail, testcasename(), ": Error, length of aggregatedResponse is not valid"); } else{ for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){ - if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){ + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse doesn't match with template expected"); } } @@ -10243,7 +10243,7 @@ module OneM2M_Testcases { var template PrimitiveContent v_contentResponse; var XSD.AnyURI v_fanoutPointAddress; - v_contentResponse.any_1[0].Container_optional := mw_contentContainerBase; + v_contentResponse.container_optional := mw_contentContainerBase; // Test control if(not(PICS_ACP_SUPPORT)) { @@ -10276,16 +10276,16 @@ module OneM2M_Testcases { tc_ac.stop; setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource"); - if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse attribute not provided"); } else{ - if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){ + if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){ setverdict(fail, testcasename(), ": Error, length of aggregatedResponse is not valid"); } else{ for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){ - if(not match(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){ + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){ setverdict(fail, testcasename(), ": Error, aggregatedResponse doesn't match with template expected"); } } @@ -10380,7 +10380,7 @@ module OneM2M_Testcases { var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var RequestPrimitive v_request; - v_createRequest.primitiveContent.any_1[0].Subscription_optional.resourceName := omit; + v_createRequest.primitiveContent.subscription_optional.resourceName := omit; // Test control // Test component configuration @@ -10507,7 +10507,7 @@ module OneM2M_Testcases { v_aeIndex := f_cse_preamble_registerAe();//c_CUDNDi); v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription - //v_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {"Not Initialized"}; + //v_request.primitiveContent.subscription_optional.notificationURI := {"Not Initialized"}; // Test Body mcaPort.send(m_request(v_request)); @@ -10563,7 +10563,7 @@ module OneM2M_Testcases { v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1); v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription - v_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; + v_request.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_aeIndex), int4101)); @@ -10622,7 +10622,7 @@ module OneM2M_Testcases { v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")})); v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription - v_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; + v_request.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)}; notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_aeIndex), int5205)); @@ -10673,8 +10673,8 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -10745,7 +10745,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; // all attributes expected + v_contentResponse.container_optional := mw_contentContainer_rc1; // all attributes expected // Test control // Test component configuration @@ -10815,7 +10815,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -10882,7 +10882,7 @@ module OneM2M_Testcases { alt { [] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_response { tc_ac.stop; - if(not(match(v_response.primitive.requestPrimitive.primitiveContent.any_1[0].Notification.subscriptionDeletion, true))) { + if(not(match(v_response.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) { setverdict(fail, testcasename() & ": subscriptionDeletion attribute have to be set to TRUE"); } if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){ @@ -10924,7 +10924,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; // all attributes expected in notification + v_contentResponse.container_optional := mw_contentContainer_rc1; // all attributes expected in notification // Test component configuration f_cf01Up(); @@ -11005,9 +11005,9 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; - v_contentResponse.any_1[0].AE_optional := m_contentAe_allOmit; // only modified attribute expected - v_contentResponse.any_1[0].AE_optional.labels := ?; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := m_contentAe_allOmit; // only modified attribute expected + v_contentResponse.aE_optional.labels := ?; // Test control @@ -11081,9 +11081,9 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; - v_contentResponse.any_1[0].AE_optional := m_contentAe_allOmit; // only modified attribute expected - v_contentResponse.any_1[0].AE_optional.resourceID := ?; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := m_contentAe_allOmit; // only modified attribute expected + v_contentResponse.aE_optional.resourceID := ?; // Test control @@ -11152,9 +11152,9 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected - v_retrieveContentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected + v_retrieveContentResponse.subscription_optional := mw_contentSubscription_rc1; // Test control @@ -11191,7 +11191,7 @@ module OneM2M_Testcases { alt { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value v_response { tc_ac.stop; - if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Subscription_optional.expirationCounter == 2 ){ + if(v_response.primitive.responsePrimitive.primitiveContent.subscription_optional.expirationCounter == 2 ){ setverdict(pass, testcasename() & ": expirationCounter has been successfully decreased by one"); } else{ @@ -11238,8 +11238,8 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -11318,8 +11318,8 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -11393,7 +11393,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; // Test control @@ -11589,7 +11589,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -11614,15 +11614,15 @@ module OneM2M_Testcases { // Test Body v_notifyHandler.start(f_CSE_SUB_BV_018(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1 f_cse_updateResource(v_request); - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_2; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_2; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2 f_cse_updateResource(v_request); - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_3; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_3; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3 f_cse_updateResource(v_request); @@ -11647,7 +11647,7 @@ module OneM2M_Testcases { alt { [] mcaPort.receive(mw_request(mw_aggregatedNotifyBase)) -> value v_response { tc_ac.stop; - if(p_numberOfAggregatedNotification == lengthof(v_response.primitive.requestPrimitive.primitiveContent.any_1[0].AggregatedNotification.notification_list)){ + if(p_numberOfAggregatedNotification == lengthof(v_response.primitive.requestPrimitive.primitiveContent.aggregatedNotification.notification_list)){ if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){ setverdict(pass, testcasename() & ": Notification received"); } @@ -11692,7 +11692,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -11717,11 +11717,11 @@ module OneM2M_Testcases { // Test Body v_notifyHandler.start(f_CSE_SUB_BV_018(v_contentResponse, 2)); // check that no notification is received - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1 f_cse_updateResource(v_request); - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_2; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_2; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2 f_cse_updateResource(v_request); @@ -11755,7 +11755,7 @@ module OneM2M_Testcases { var CseTester v_notifyHandler; var integer v_ae2Index := -1; - v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; // all attributes expected + v_contentResponse.aE_optional := mw_contentAeBase; // all attributes expected // Test control @@ -11784,15 +11784,15 @@ module OneM2M_Testcases { // Test Body v_notifyHandler.start(f_cse_notifyProcedure(v_contentResponse)); // check if the notification is well received and if its content matchs - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1 f_cse_updateResource(v_request); - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_2; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_2; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2 f_cse_updateResource(v_request); - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_3; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_3; v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3 f_cse_updateResource(v_request); @@ -11835,12 +11835,12 @@ module OneM2M_Testcases { // Preamble v_aeIndex := f_cse_preamble_registerAe(-, -); // Only use for setting the ACR_2's accessControlOriginators attribute to AE_ID - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2}; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; + v_createRequest.primitiveContent.accessControlPolicy_optional.privileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2}; + v_createRequest.primitiveContent.accessControlPolicy_optional.privileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1; - v_contentResponse.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2};// TODO To handle reverse order of acrs - v_contentResponse.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy_optional.privileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2};// TODO To handle reverse order of acrs + v_contentResponse.accessControlPolicy_optional.privileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; // Test Body v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource @@ -11897,12 +11897,12 @@ module OneM2M_Testcases { // Preamble v_aeIndex := f_cse_preamble_registerAe(-, -); // Only use for setting the ACR_2's accessControlOriginators attribute to AE_ID - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2}; - v_createRequest.primitiveContent.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; + v_createRequest.primitiveContent.accessControlPolicy_optional.selfPrivileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2}; + v_createRequest.primitiveContent.accessControlPolicy_optional.selfPrivileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; - v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1; - v_contentResponse.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2};//TODO To handle reverse order of acrs - v_contentResponse.any_1[0].AccessControlPolicy_optional.selfPrivileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; + v_contentResponse.accessControlPolicy_optional := mw_contentAcp_rc1; + v_contentResponse.accessControlPolicy_optional.selfPrivileges.accessControlRule_list := {v_accessControlRule_1,v_accessControlRule_2};//TODO To handle reverse order of acrs + v_contentResponse.accessControlPolicy_optional.selfPrivileges.accessControlRule_list[1].accessControlOriginators := {f_getOriginator(v_aeIndex)}; // Test Body v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource @@ -11947,7 +11947,7 @@ module OneM2M_Testcases { testcase TC_CSE_SEC_ACP_BV_003_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; f_CSE_SEC_ACP_BV_003(v_updateRequest); }//end TC_CSE_SEC_ACP_BV_003_02 @@ -12046,7 +12046,7 @@ module OneM2M_Testcases { testcase TC_CSE_SEC_ACP_BV_004_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; f_CSE_SEC_ACP_BV_004(v_updateRequest); }//end TC_CSE_SEC_ACP_BV_004_02 @@ -12121,7 +12121,7 @@ module OneM2M_Testcases { testcase TC_CSE_SEC_ACP_BV_011_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_SEC_ACP_BV_011(v_updateRequest); }//end TC_CSE_SEC_ACP_BV_011_02 @@ -12193,7 +12193,7 @@ module OneM2M_Testcases { testcase TC_CSE_SEC_ACP_BO_012_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateContainerBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.container_optional.labels := v_labels_1; f_CSE_SEC_ACP_BO_012(v_updateRequest, int62); //TODO Fix p_acor }//end TC_CSE_SEC_ACP_BO_012_02 @@ -12283,7 +12283,7 @@ module OneM2M_Testcases { testcase TC_CSE_SEC_ACP_BO_013_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; f_CSE_SEC_ACP_BO_013(v_updateRequest); }//end TC_CSE_SEC_ACP_BO_013_02 @@ -12369,7 +12369,7 @@ module OneM2M_Testcases { testcase TC_CSE_SEC_ACP_BV_014_02() runs on CseTester system CseSystem { //Update var template RequestPrimitive v_updateRequest := m_updateAeBase; var Labels v_labels_1:= {"VALUE_1"}; - v_updateRequest.primitiveContent.any_1[0].AE_optional.labels := v_labels_1; + v_updateRequest.primitiveContent.aE_optional.labels := v_labels_1; f_CSE_SEC_ACP_BV_014(v_updateRequest); }//end TC_CSE_SEC_ACP_BV_014_02 @@ -12489,7 +12489,7 @@ module OneM2M_Testcases { f_cse_updateResource(v_updateRequest); // Test Body - v_updateRequest.primitiveContent.any_1[0].AE_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)}; + v_updateRequest.primitiveContent.aE_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)}; v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest); mcaPort.send(m_request(v_updateRequest)); @@ -12560,7 +12560,7 @@ module OneM2M_Testcases { f_cse_updateResource(v_updateRequest); // Test Body - v_updateRequest.primitiveContent.any_1[0].AE_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)}; + v_updateRequest.primitiveContent.aE_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)}; v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest); mcaPort.send(m_request(v_updateRequest));