Skip to content
Snippets Groups Projects
Commit cd390132 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Removing _optional from field names in PrimitiveContent type to improve readiness of code 


Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 2a073d97
No related branches found
No related tags found
1 merge request!25Ae fixes
Expand all Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Functions.ttcn
+ 273
− 273
View file @ cd390132
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* $Id: OneM2M_Functions.ttcn 308 2017-06-21 09:44:17Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -207,8 +207,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.aE_optional)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE_optional;
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
......@@ -278,8 +278,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.aE_optional)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE_optional;
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.aE;
v_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent);
vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_aeAuxIndex};
......@@ -327,8 +327,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.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)};
if(ischosen(p_createRequestPrimitive.primitiveContent.subscription)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced
p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
}
p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(p_aeIndex)));
}
......@@ -358,8 +358,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.aE_optional)) {
v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE_optional.aE_ID;
if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE)) {
v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.aE.aE_ID;
}
}
......@@ -520,8 +520,8 @@ module OneM2M_Functions {
v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_acpName := c_acpAuxName);//"MyAcp_2"
v_request := valueof(m_createContainerBase);
v_request.primitiveContent.container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)};
v_request.primitiveContent.container_optional.resourceName := "MyContainerAux";
v_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)};
v_request.primitiveContent.container.resourceName := "MyContainerAux";
v_containerResourceIndex := f_cse_createResource(int3, v_request, p_parentIndex);
......@@ -636,7 +636,7 @@ module OneM2M_Functions {
v_request.to_ := f_getResourceAddress(vc_acpAuxIndex);
v_request.from_ := f_getOriginator(vc_acpAuxIndex);
v_request.primitiveContent.accessControlPolicy_optional.privileges.accessControlRule_list := {
v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {
{
accessControlOriginators := PX_ACOR, //{"admin:admin"}
accessControlOperations := valueof(p_allowedOperations),
......@@ -755,66 +755,66 @@ 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.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)
if(isvalue(p_response.primitiveContent.accessControlPolicy) and
not(ispresent(p_response.primitiveContent.accessControlPolicy.resourceName))) {
p_response.primitiveContent.accessControlPolicy.resourceName := p_request.primitiveContent.accessControlPolicy.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.accessControlPolicy.resourceName)
}
}
case (int2) {
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)
if(isvalue(p_response.primitiveContent.aE) and
not(ispresent(p_response.primitiveContent.aE.resourceName))) {
p_response.primitiveContent.aE.resourceName := p_request.primitiveContent.aE.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.aE.resourceName)
}
}
case (int3) {
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)
if(isvalue(p_response.primitiveContent.container) and
not(ispresent(p_response.primitiveContent.container.resourceName))) {
p_response.primitiveContent.container.resourceName := p_request.primitiveContent.container.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.container.resourceName)
}
}
case (int4) {
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)
if(isvalue(p_response.primitiveContent.contentInstance) and
not(ispresent(p_response.primitiveContent.contentInstance.resourceName))) {
p_response.primitiveContent.contentInstance.resourceName := p_request.primitiveContent.contentInstance.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.contentInstance.resourceName)
}
}
case (int15) {
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)
if (isvalue(p_response.primitiveContent.pollingChannel) and
not(ispresent(p_response.primitiveContent.pollingChannel.resourceName))) {
p_response.primitiveContent.pollingChannel.resourceName := p_request.primitiveContent.pollingChannel.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.pollingChannel.resourceName)
}
}
case (int16) {
if (isvalue(p_response.primitiveContent.remoteCSE_optional) and
not(ispresent(p_response.primitiveContent.remoteCSE_optional.resourceName))) {
p_response.primitiveContent.remoteCSE_optional.resourceName := p_request.primitiveContent.remoteCSE_optional.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.remoteCSE_optional.resourceName)
if (isvalue(p_response.primitiveContent.remoteCSE) and
not(ispresent(p_response.primitiveContent.remoteCSE.resourceName))) {
p_response.primitiveContent.remoteCSE.resourceName := p_request.primitiveContent.remoteCSE.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.remoteCSE.resourceName)
}
}
case (int18) {
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)
if (isvalue(p_response.primitiveContent.schedule) and
not(ispresent(p_response.primitiveContent.schedule.resourceName))) {
p_response.primitiveContent.schedule.resourceName := p_request.primitiveContent.schedule.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.schedule.resourceName)
}
}
case (int23) {
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)
if (isvalue(p_response.primitiveContent.subscription) and
not(ispresent(p_response.primitiveContent.subscription.resourceName))) {
p_response.primitiveContent.subscription.resourceName := p_request.primitiveContent.subscription.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
}
}
case (int9) {
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)
if (isvalue(p_response.primitiveContent.group_) and
not(ispresent(p_response.primitiveContent.group_.resourceName))) {
p_response.primitiveContent.group_.resourceName := p_request.primitiveContent.group_.resourceName;
log(__SCOPE__ & ": Info: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
}
}
case else {
......@@ -831,24 +831,24 @@ module OneM2M_Functions {
var integer i;
var integer v_numberOfAggregatedNotification;
if (ischosen(p_primitiveContent.aE_optional)){
if (ischosen(p_primitiveContent.aE)){
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)
v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.AE_optional, p_primitiveContent.aE)
}
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)
v_matchResult :=match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE)
}
else if (ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification)) {
v_matchResult := true;
v_numberOfAggregatedNotification := lengthof(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list);
for(i := 0; i< v_numberOfAggregatedNotification; i := i + 1){
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))){
if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource.AE_optional, p_primitiveContent.aE))){
v_matchResult := false;
}
}
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))){
if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE))){
v_matchResult := false;
}
}
......@@ -860,12 +860,12 @@ module OneM2M_Functions {
}
if (ischosen(p_primitiveContent.container_optional)){
if (ischosen(p_primitiveContent.container)){
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)
v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.Container_optional, p_primitiveContent.container)
}
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)
v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container, p_primitiveContent.container)
}
}
......@@ -1149,8 +1149,8 @@ module OneM2M_Functions {
// 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.aE_optional)){
var AE_optional v_ae := p_resource.aE_optional;
if(ischosen(p_resource.aE)){
var AE_optional v_ae := p_resource.aE;
var AE_optional v_aeModified;
v_resourceIndex := lengthof(vc_resourcesList) - 1;
......@@ -1170,8 +1170,8 @@ module OneM2M_Functions {
v_aeModified.aE_ID := v_ae.aE_ID;
v_aeModified.resourceName := v_ae.resourceName;
p_resource.aE_optional := v_ae;
p_modifiedResource.aE_optional := v_aeModified;
p_resource.aE := v_ae;
p_modifiedResource.aE := v_aeModified;
return f_setResource(p_resource, p_parentIndex);
}
......@@ -1264,26 +1264,26 @@ module OneM2M_Functions {
}
if (p_resourceType == int9) {//group
if(match(valueof(p_request.primitiveContent.group_optional.memberIDs), v_defaultListOfURIs )){
p_request.primitiveContent.group_optional.memberIDs := {f_getResourceAddress(p_parentIndex)};
if(match(valueof(p_request.primitiveContent.group_.memberIDs), v_defaultListOfURIs )){
p_request.primitiveContent.group_.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.container_optional.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy
p_request.primitiveContent.container.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy
}
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(ispresent(p_request.primitiveContent.container.accessControlPolicyIDs)) {
if(match(valueof(p_request.primitiveContent.container.accessControlPolicyIDs), v_defaultAcpIDs )){
p_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
}
}
}
if (p_resourceType == int15) {//pollingChannel
if(ischosen(vc_resourcesList[p_parentIndex].resource.aE_optional)) {
p_request.from_ := vc_resourcesList[p_parentIndex].resource.aE_optional.aE_ID;
if(ischosen(vc_resourcesList[p_parentIndex].resource.aE)) {
p_request.from_ := vc_resourcesList[p_parentIndex].resource.aE.aE_ID;
}
}
......@@ -1292,24 +1292,24 @@ module OneM2M_Functions {
if (p_resourceType == int23) {//subscription
//notificationURI
if(match(valueof(p_request.primitiveContent.subscription_optional.notificationURI), v_defaultListOfURIs )){
p_request.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(p_parentIndex)};
if(match(valueof(p_request.primitiveContent.subscription.notificationURI), v_defaultListOfURIs )){
p_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_parentIndex)};
}
//creator attribute
if(ispresent(p_request.primitiveContent.subscription_optional.creator)) {
p_request.primitiveContent.subscription_optional.creator := f_getCreator(p_parentIndex);
if(ispresent(p_request.primitiveContent.subscription.creator)) {
p_request.primitiveContent.subscription.creator := f_getCreator(p_parentIndex);
}
//accessControlPolicyIds
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(ispresent(p_request.primitiveContent.subscription.accessControlPolicyIDs)) {
if(match(valueof(p_request.primitiveContent.subscription.accessControlPolicyIDs), v_defaultAcpIDs )){
p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
}
}
}
if (p_resourceType == int4) {//contentInstance
//creator attribute
if(ispresent(p_request.primitiveContent.contentInstance_optional.creator)) {
p_request.primitiveContent.contentInstance_optional.creator := f_getCreator(p_parentIndex);
if(ispresent(p_request.primitiveContent.contentInstance.creator)) {
p_request.primitiveContent.contentInstance.creator := f_getCreator(p_parentIndex);
}
}
......@@ -1407,32 +1407,32 @@ module OneM2M_Functions {
*/
function f_getResourceId(PrimitiveContent p_contentResource) return XSD.ID {
if(ischosen(p_contentResource.accessControlPolicy_optional)) {
return f_resourceIdCleaner(p_contentResource.accessControlPolicy_optional.resourceID);
if(ischosen(p_contentResource.accessControlPolicy)) {
return f_resourceIdCleaner(p_contentResource.accessControlPolicy.resourceID);
}
if(ischosen(p_contentResource.container_optional)) {
return f_resourceIdCleaner(p_contentResource.container_optional.resourceID);
if(ischosen(p_contentResource.container)) {
return f_resourceIdCleaner(p_contentResource.container.resourceID);
}
if(ischosen(p_contentResource.contentInstance_optional)) {
return f_resourceIdCleaner(p_contentResource.contentInstance_optional.resourceID);
if(ischosen(p_contentResource.contentInstance)) {
return f_resourceIdCleaner(p_contentResource.contentInstance.resourceID);
}
if(ischosen(p_contentResource.schedule_optional)) {
return f_resourceIdCleaner(p_contentResource.schedule_optional.resourceID);
if(ischosen(p_contentResource.schedule)) {
return f_resourceIdCleaner(p_contentResource.schedule.resourceID);
}
if(ischosen(p_contentResource.pollingChannel_optional)) {
return f_resourceIdCleaner(p_contentResource.pollingChannel_optional.resourceID);
if(ischosen(p_contentResource.pollingChannel)) {
return f_resourceIdCleaner(p_contentResource.pollingChannel.resourceID);
}
if(ischosen(p_contentResource.subscription_optional)) {
return f_resourceIdCleaner(p_contentResource.subscription_optional.resourceID);
if(ischosen(p_contentResource.subscription)) {
return f_resourceIdCleaner(p_contentResource.subscription.resourceID);
}
if(ischosen(p_contentResource.group_optional)) {
return f_resourceIdCleaner(p_contentResource.group_optional.resourceID);
if(ischosen(p_contentResource.group_)) {
return f_resourceIdCleaner(p_contentResource.group_.resourceID);
}
if(ischosen(p_contentResource.aE_optional)) {
return f_resourceIdCleaner(p_contentResource.aE_optional.resourceID);
if(ischosen(p_contentResource.aE)) {
return f_resourceIdCleaner(p_contentResource.aE.resourceID);
}
if(ischosen(p_contentResource.serviceSubscribedAppRule_optional)) {
return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule_optional.resourceID);
if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule.resourceID);
}
log(""&__SCOPE__&":WARNING: Primitive Content Kind not implemented");
......@@ -1448,32 +1448,32 @@ module OneM2M_Functions {
*/
function f_getResourceName(PrimitiveContent p_contentResource) return XSD.ID {
if(ischosen(p_contentResource.accessControlPolicy_optional)) {
return p_contentResource.accessControlPolicy_optional.resourceName;
if(ischosen(p_contentResource.accessControlPolicy)) {
return p_contentResource.accessControlPolicy.resourceName;
}
if(ischosen(p_contentResource.container_optional)) {
return p_contentResource.container_optional.resourceName;
if(ischosen(p_contentResource.container)) {
return p_contentResource.container.resourceName;
}
if(ischosen(p_contentResource.contentInstance_optional)) {
return p_contentResource.contentInstance_optional.resourceName;
if(ischosen(p_contentResource.contentInstance)) {
return p_contentResource.contentInstance.resourceName;
}
if(ischosen(p_contentResource.schedule_optional)) {
return p_contentResource.schedule_optional.resourceName;
if(ischosen(p_contentResource.schedule)) {
return p_contentResource.schedule.resourceName;
}
if(ischosen(p_contentResource.pollingChannel_optional)) {
return p_contentResource.pollingChannel_optional.resourceName;
if(ischosen(p_contentResource.pollingChannel)) {
return p_contentResource.pollingChannel.resourceName;
}
if(ischosen(p_contentResource.subscription_optional)) {
return p_contentResource.subscription_optional.resourceName;
if(ischosen(p_contentResource.subscription)) {
return p_contentResource.subscription.resourceName;
}
if(ischosen(p_contentResource.group_optional)) {
return p_contentResource.group_optional.resourceName;
if(ischosen(p_contentResource.group_)) {
return p_contentResource.group_.resourceName;
}
if(ischosen(p_contentResource.aE_optional)) {
return p_contentResource.aE_optional.resourceName;
if(ischosen(p_contentResource.aE)) {
return p_contentResource.aE.resourceName;
}
if(ischosen(p_contentResource.serviceSubscribedAppRule_optional)) {
return p_contentResource.serviceSubscribedAppRule_optional.resourceName;
if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
return p_contentResource.serviceSubscribedAppRule.resourceName;
}
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
......@@ -1494,8 +1494,8 @@ module OneM2M_Functions {
}
if(PX_FROM_IS_AE_ID) {
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE_optional)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE_optional.aE_ID;
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
} else {
return f_getOriginator(vc_resourcesList[p_targetResourceIndex].parentIndex);
}
......@@ -1516,8 +1516,8 @@ module OneM2M_Functions {
return PX_CSE_ID;
}
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE_optional)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE_optional.aE_ID;
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
} else {
return f_getCreator(vc_resourcesList[p_targetResourceIndex].parentIndex);
}
......@@ -1664,23 +1664,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.aE_optional)){
p_requestPrimitive.primitiveContent.aE_optional.accessControlPolicyIDs := p_accessControlPolicyIDs;
if (ischosen(p_requestPrimitive.primitiveContent.aE)){
p_requestPrimitive.primitiveContent.aE.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.container)){
p_requestPrimitive.primitiveContent.container.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.group_)){
p_requestPrimitive.primitiveContent.group_.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.serviceSubscribedAppRule)){
p_requestPrimitive.primitiveContent.serviceSubscribedAppRule.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.subscription)){
p_requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := p_accessControlPolicyIDs;
}
else if (ischosen(p_requestPrimitive.primitiveContent.locationPolicy_optional)){
p_requestPrimitive.primitiveContent.locationPolicy_optional.accessControlPolicyIDs := p_accessControlPolicyIDs;
else if (ischosen(p_requestPrimitive.primitiveContent.locationPolicy)){
p_requestPrimitive.primitiveContent.locationPolicy.accessControlPolicyIDs := p_accessControlPolicyIDs;
}
return valueof(p_requestPrimitive);
}
......@@ -1692,8 +1692,8 @@ module OneM2M_Functions {
*/
function f_getAeId(integer p_targetResourceIndex := -1) runs on AeTester return XSD.ID {
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE_optional)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE_optional.aE_ID;
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
}
log("f_getAeId: WARNING: p_targetResourceIndex does not refer to AE resource");
......@@ -1799,232 +1799,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.container_optional)){ // Container
v_primitiveContent := {container_optional := mw_contentContainerBase};
if(ischosen(p_primitiveContent.container)){ // Container
v_primitiveContent := {container := mw_contentContainerBase};
if(ispresent(p_primitiveContent.container_optional.labels)){
v_primitiveContent.container_optional.labels := ?;
if(ispresent(p_primitiveContent.container.labels)){
v_primitiveContent.container.labels := ?;
}
if(ispresent(p_primitiveContent.container_optional.accessControlPolicyIDs)){
v_primitiveContent.container_optional.accessControlPolicyIDs := ?;
if(ispresent(p_primitiveContent.container.accessControlPolicyIDs)){
v_primitiveContent.container.accessControlPolicyIDs := ?;
}
if(ispresent(p_primitiveContent.container_optional.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.container_optional.dynamicAuthorizationConsultationIDs := ?;
if(ispresent(p_primitiveContent.container.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.container.dynamicAuthorizationConsultationIDs := ?;
}
if(ispresent(p_primitiveContent.container_optional.announceTo)){
v_primitiveContent.container_optional.announceTo := ?;
if(ispresent(p_primitiveContent.container.announceTo)){
v_primitiveContent.container.announceTo := ?;
}
if(ispresent(p_primitiveContent.container_optional.announcedAttribute)){
v_primitiveContent.container_optional.announcedAttribute := ?;
if(ispresent(p_primitiveContent.container.announcedAttribute)){
v_primitiveContent.container.announcedAttribute := ?;
}
if(ispresent(p_primitiveContent.container_optional.creator)){
v_primitiveContent.container_optional.creator := ?;
if(ispresent(p_primitiveContent.container.creator)){
v_primitiveContent.container.creator := ?;
}
if(ispresent(p_primitiveContent.container_optional.maxNrOfInstances)){
v_primitiveContent.container_optional.maxNrOfInstances := ?;
if(ispresent(p_primitiveContent.container.maxNrOfInstances)){
v_primitiveContent.container.maxNrOfInstances := ?;
}
if(ispresent(p_primitiveContent.container_optional.maxByteSize)){
v_primitiveContent.container_optional.maxByteSize := ?;
if(ispresent(p_primitiveContent.container.maxByteSize)){
v_primitiveContent.container.maxByteSize := ?;
}
if(ispresent(p_primitiveContent.container_optional.maxInstanceAge)){
v_primitiveContent.container_optional.maxInstanceAge := ?;
if(ispresent(p_primitiveContent.container.maxInstanceAge)){
v_primitiveContent.container.maxInstanceAge := ?;
}
if(ispresent(p_primitiveContent.container_optional.locationID)){
v_primitiveContent.container_optional.locationID := ?;
if(ispresent(p_primitiveContent.container.locationID)){
v_primitiveContent.container.locationID := ?;
}
if(ispresent(p_primitiveContent.container_optional.ontologyRef)){
v_primitiveContent.container_optional.ontologyRef := ?;
if(ispresent(p_primitiveContent.container.ontologyRef)){
v_primitiveContent.container.ontologyRef := ?;
}
if(ispresent(p_primitiveContent.container_optional.disableRetrieval)){
v_primitiveContent.container_optional.disableRetrieval := ?;
if(ispresent(p_primitiveContent.container.disableRetrieval)){
v_primitiveContent.container.disableRetrieval := ?;
}
}
else if(ischosen(p_primitiveContent.aE_optional)){ // AE
v_primitiveContent := {aE_optional := mw_contentAeBase};
else if(ischosen(p_primitiveContent.aE)){ // AE
v_primitiveContent := {aE := mw_contentAeBase};
if(ispresent(p_primitiveContent.aE_optional.labels)){
v_primitiveContent.aE_optional.labels := ?;
if(ispresent(p_primitiveContent.aE.labels)){
v_primitiveContent.aE.labels := ?;
}
if(ispresent(p_primitiveContent.aE_optional.accessControlPolicyIDs)){
v_primitiveContent.aE_optional.accessControlPolicyIDs := ?;
if(ispresent(p_primitiveContent.aE.accessControlPolicyIDs)){
v_primitiveContent.aE.accessControlPolicyIDs := ?;
}
if(ispresent(p_primitiveContent.aE_optional.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.aE_optional.dynamicAuthorizationConsultationIDs := ?;
if(ispresent(p_primitiveContent.aE.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.aE.dynamicAuthorizationConsultationIDs := ?;
}
if(ispresent(p_primitiveContent.aE_optional.announceTo)){
v_primitiveContent.aE_optional.announceTo := ?;
if(ispresent(p_primitiveContent.aE.announceTo)){
v_primitiveContent.aE.announceTo := ?;
}
if(ispresent(p_primitiveContent.aE_optional.announcedAttribute)){
v_primitiveContent.aE_optional.announcedAttribute := ?;
if(ispresent(p_primitiveContent.aE.announcedAttribute)){
v_primitiveContent.aE.announcedAttribute := ?;
}
if(ispresent(p_primitiveContent.aE_optional.appName)){
v_primitiveContent.aE_optional.appName := ?;
if(ispresent(p_primitiveContent.aE.appName)){
v_primitiveContent.aE.appName := ?;
}
if(ispresent(p_primitiveContent.aE_optional.pointOfAccess)){
v_primitiveContent.aE_optional.pointOfAccess := ?;
if(ispresent(p_primitiveContent.aE.pointOfAccess)){
v_primitiveContent.aE.pointOfAccess := ?;
}
if(ispresent(p_primitiveContent.aE_optional.ontologyRef)){
v_primitiveContent.aE_optional.ontologyRef := ?;
if(ispresent(p_primitiveContent.aE.ontologyRef)){
v_primitiveContent.aE.ontologyRef := ?;
}
if(ispresent(p_primitiveContent.aE_optional.nodeLink)){
v_primitiveContent.aE_optional.nodeLink := ?;
if(ispresent(p_primitiveContent.aE.nodeLink)){
v_primitiveContent.aE.nodeLink := ?;
}
if(ispresent(p_primitiveContent.aE_optional.contentSerialization)){
v_primitiveContent.aE_optional.contentSerialization := ?;
if(ispresent(p_primitiveContent.aE.contentSerialization)){
v_primitiveContent.aE.contentSerialization := ?;
}
if(ispresent(p_primitiveContent.aE_optional.e2eSecInfo)){
v_primitiveContent.aE_optional.e2eSecInfo := ?;
if(ispresent(p_primitiveContent.aE.e2eSecInfo)){
v_primitiveContent.aE.e2eSecInfo := ?;
}
}
else if(ischosen(p_primitiveContent.accessControlPolicy_optional)){ // ACP
v_primitiveContent := {accessControlPolicy_optional := mw_contentAcpBase};
else if(ischosen(p_primitiveContent.accessControlPolicy)){ // ACP
v_primitiveContent := {accessControlPolicy := mw_contentAcpBase};
if(ispresent(p_primitiveContent.accessControlPolicy_optional.labels)){
v_primitiveContent.accessControlPolicy_optional.labels := ?;
if(ispresent(p_primitiveContent.accessControlPolicy.labels)){
v_primitiveContent.accessControlPolicy.labels := ?;
}
if(ispresent(p_primitiveContent.accessControlPolicy_optional.announceTo)){
v_primitiveContent.accessControlPolicy_optional.announceTo := ?;
if(ispresent(p_primitiveContent.accessControlPolicy.announceTo)){
v_primitiveContent.accessControlPolicy.announceTo := ?;
}
}
else if(ischosen(p_primitiveContent.contentInstance_optional)){ // ContentInstance
v_primitiveContent := {contentInstance_optional := mw_contentContentInstanceBase};
else if(ischosen(p_primitiveContent.contentInstance)){ // ContentInstance
v_primitiveContent := {contentInstance := mw_contentContentInstanceBase};
if(ispresent(p_primitiveContent.contentInstance_optional.labels)){
v_primitiveContent.contentInstance_optional.labels := ?;
if(ispresent(p_primitiveContent.contentInstance.labels)){
v_primitiveContent.contentInstance.labels := ?;
}
if(ispresent(p_primitiveContent.contentInstance_optional.announceTo)){
v_primitiveContent.contentInstance_optional.announceTo := ?;
if(ispresent(p_primitiveContent.contentInstance.announceTo)){
v_primitiveContent.contentInstance.announceTo := ?;
}
if(ispresent(p_primitiveContent.contentInstance_optional.announcedAttribute)){
v_primitiveContent.contentInstance_optional.announcedAttribute := ?;
if(ispresent(p_primitiveContent.contentInstance.announcedAttribute)){
v_primitiveContent.contentInstance.announcedAttribute := ?;
}
if(ispresent(p_primitiveContent.contentInstance_optional.creator)){
v_primitiveContent.contentInstance_optional.creator := ?;
if(ispresent(p_primitiveContent.contentInstance.creator)){
v_primitiveContent.contentInstance.creator := ?;
}
if(ispresent(p_primitiveContent.contentInstance_optional.contentInfo)){
v_primitiveContent.contentInstance_optional.contentInfo := ?;
if(ispresent(p_primitiveContent.contentInstance.contentInfo)){
v_primitiveContent.contentInstance.contentInfo := ?;
}
if(ispresent(p_primitiveContent.contentInstance_optional.contentRef)){
v_primitiveContent.contentInstance_optional.contentRef := ?;
if(ispresent(p_primitiveContent.contentInstance.contentRef)){
v_primitiveContent.contentInstance.contentRef := ?;
}
if(ispresent(p_primitiveContent.contentInstance_optional.ontologyRef)){
v_primitiveContent.contentInstance_optional.ontologyRef := ?;
if(ispresent(p_primitiveContent.contentInstance.ontologyRef)){
v_primitiveContent.contentInstance.ontologyRef := ?;
}
}
else if(ischosen(p_primitiveContent.group_optional)){ // Group
v_primitiveContent := {group_optional := mw_contentGroupBase};
else if(ischosen(p_primitiveContent.group_)){ // Group
v_primitiveContent := {group_ := mw_contentGroupBase};
if(ispresent(p_primitiveContent.group_optional.labels)){
v_primitiveContent.group_optional.labels := ?;
if(ispresent(p_primitiveContent.group_.labels)){
v_primitiveContent.group_.labels := ?;
}
if(ispresent(p_primitiveContent.group_optional.accessControlPolicyIDs)){
v_primitiveContent.group_optional.accessControlPolicyIDs := ?;
if(ispresent(p_primitiveContent.group_.accessControlPolicyIDs)){
v_primitiveContent.group_.accessControlPolicyIDs := ?;
}
if(ispresent(p_primitiveContent.group_optional.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.group_optional.dynamicAuthorizationConsultationIDs := ?;
if(ispresent(p_primitiveContent.group_.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.group_.dynamicAuthorizationConsultationIDs := ?;
}
if(ispresent(p_primitiveContent.group_optional.announceTo)){
v_primitiveContent.group_optional.announceTo := ?;
if(ispresent(p_primitiveContent.group_.announceTo)){
v_primitiveContent.group_.announceTo := ?;
}
if(ispresent(p_primitiveContent.group_optional.announcedAttribute)){
v_primitiveContent.group_optional.announcedAttribute := ?;
if(ispresent(p_primitiveContent.group_.announcedAttribute)){
v_primitiveContent.group_.announcedAttribute := ?;
}
if(ispresent(p_primitiveContent.group_optional.creator)){
v_primitiveContent.group_optional.creator := ?;
if(ispresent(p_primitiveContent.group_.creator)){
v_primitiveContent.group_.creator := ?;
}
if(ispresent(p_primitiveContent.group_optional.membersAccessControlPolicyIDs)){
v_primitiveContent.group_optional.membersAccessControlPolicyIDs := ?;
if(ispresent(p_primitiveContent.group_.membersAccessControlPolicyIDs)){
v_primitiveContent.group_.membersAccessControlPolicyIDs := ?;
}
if(ispresent(p_primitiveContent.group_optional.memberTypeValidated)){
v_primitiveContent.group_optional.memberTypeValidated := ?;
if(ispresent(p_primitiveContent.group_.memberTypeValidated)){
v_primitiveContent.group_.memberTypeValidated := ?;
}
if(ispresent(p_primitiveContent.group_optional.consistencyStrategy)){
v_primitiveContent.group_optional.consistencyStrategy := ?;
if(ispresent(p_primitiveContent.group_.consistencyStrategy)){
v_primitiveContent.group_.consistencyStrategy := ?;
}
if(ispresent(p_primitiveContent.group_optional.groupName)){
v_primitiveContent.group_optional.groupName := ?;
if(ispresent(p_primitiveContent.group_.groupName)){
v_primitiveContent.group_.groupName := ?;
}
}
else if(ischosen(p_primitiveContent.pollingChannel_optional)){ // PollingChannel
v_primitiveContent := {pollingChannel_optional := mw_contentPollingChannelBase};
else if(ischosen(p_primitiveContent.pollingChannel)){ // PollingChannel
v_primitiveContent := {pollingChannel := mw_contentPollingChannelBase};
if(ispresent(p_primitiveContent.pollingChannel_optional.labels)){
v_primitiveContent.pollingChannel_optional.labels := ?;
if(ispresent(p_primitiveContent.pollingChannel.labels)){
v_primitiveContent.pollingChannel.labels := ?;
}
}
else if(ischosen(p_primitiveContent.schedule_optional)){ // Schedule
v_primitiveContent := {schedule_optional := mw_contentScheduleBase};
else if(ischosen(p_primitiveContent.schedule)){ // Schedule
v_primitiveContent := {schedule := mw_contentScheduleBase};
if(ispresent(p_primitiveContent.schedule_optional.labels)){
v_primitiveContent.schedule_optional.labels := ?;
if(ispresent(p_primitiveContent.schedule.labels)){
v_primitiveContent.schedule.labels := ?;
}
if(ispresent(p_primitiveContent.schedule_optional.announceTo)){
v_primitiveContent.schedule_optional.announceTo := ?;
if(ispresent(p_primitiveContent.schedule.announceTo)){
v_primitiveContent.schedule.announceTo := ?;
}
if(ispresent(p_primitiveContent.schedule_optional.announcedAttribute)){
v_primitiveContent.schedule_optional.announcedAttribute := ?;
if(ispresent(p_primitiveContent.schedule.announcedAttribute)){
v_primitiveContent.schedule.announcedAttribute := ?;
}
}
else if(ischosen(p_primitiveContent.subscription_optional)){ // Schedule
v_primitiveContent := {subscription_optional := mw_contentSubscriptionBase};
else if(ischosen(p_primitiveContent.subscription)){ // Schedule
v_primitiveContent := {subscription := mw_contentSubscriptionBase};
if(ispresent(p_primitiveContent.subscription_optional.labels)){
v_primitiveContent.subscription_optional.labels := ?;
if(ispresent(p_primitiveContent.subscription.labels)){
v_primitiveContent.subscription.labels := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.accessControlPolicyIDs)){
v_primitiveContent.subscription_optional.accessControlPolicyIDs := ?;
if(ispresent(p_primitiveContent.subscription.accessControlPolicyIDs)){
v_primitiveContent.subscription.accessControlPolicyIDs := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.subscription_optional.dynamicAuthorizationConsultationIDs := ?;
if(ispresent(p_primitiveContent.subscription.dynamicAuthorizationConsultationIDs)){
v_primitiveContent.subscription.dynamicAuthorizationConsultationIDs := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.creator)){
v_primitiveContent.subscription_optional.creator := ?;
if(ispresent(p_primitiveContent.subscription.creator)){
v_primitiveContent.subscription.creator := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.eventNotificationCriteria)){
v_primitiveContent.subscription_optional.eventNotificationCriteria := ?;
if(ispresent(p_primitiveContent.subscription.eventNotificationCriteria)){
v_primitiveContent.subscription.eventNotificationCriteria := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.expirationCounter)){
v_primitiveContent.subscription_optional.expirationCounter := ?;
if(ispresent(p_primitiveContent.subscription.expirationCounter)){
v_primitiveContent.subscription.expirationCounter := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.groupID)){
v_primitiveContent.subscription_optional.groupID := ?;
if(ispresent(p_primitiveContent.subscription.groupID)){
v_primitiveContent.subscription.groupID := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.notificationForwardingURI)){
v_primitiveContent.subscription_optional.notificationForwardingURI := ?;
if(ispresent(p_primitiveContent.subscription.notificationForwardingURI)){
v_primitiveContent.subscription.notificationForwardingURI := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.batchNotify)){
v_primitiveContent.subscription_optional.batchNotify := ?;
if(ispresent(p_primitiveContent.subscription.batchNotify)){
v_primitiveContent.subscription.batchNotify := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.rateLimit)){
v_primitiveContent.subscription_optional.rateLimit := ?;
if(ispresent(p_primitiveContent.subscription.rateLimit)){
v_primitiveContent.subscription.rateLimit := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.preSubscriptionNotify)){
v_primitiveContent.subscription_optional.preSubscriptionNotify := ?;
if(ispresent(p_primitiveContent.subscription.preSubscriptionNotify)){
v_primitiveContent.subscription.preSubscriptionNotify := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.pendingNotification)){
v_primitiveContent.subscription_optional.pendingNotification := ?;
if(ispresent(p_primitiveContent.subscription.pendingNotification)){
v_primitiveContent.subscription.pendingNotification := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.notificationStoragePriority)){
v_primitiveContent.subscription_optional.notificationStoragePriority := ?;
if(ispresent(p_primitiveContent.subscription.notificationStoragePriority)){
v_primitiveContent.subscription.notificationStoragePriority := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.latestNotify)){
v_primitiveContent.subscription_optional.latestNotify := ?;
if(ispresent(p_primitiveContent.subscription.latestNotify)){
v_primitiveContent.subscription.latestNotify := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.notificationContentType)){
v_primitiveContent.subscription_optional.notificationContentType := ?;
if(ispresent(p_primitiveContent.subscription.notificationContentType)){
v_primitiveContent.subscription.notificationContentType := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.notificationEventCat)){
v_primitiveContent.subscription_optional.notificationEventCat := ?;
if(ispresent(p_primitiveContent.subscription.notificationEventCat)){
v_primitiveContent.subscription.notificationEventCat := ?;
}
if(ispresent(p_primitiveContent.subscription_optional.subscriberURI)){
v_primitiveContent.subscription_optional.subscriberURI := ?;
if(ispresent(p_primitiveContent.subscription.subscriberURI)){
v_primitiveContent.subscription.subscriberURI := ?;
}
}
return v_primitiveContent;
......
LibOneM2M/OneM2M_Pics.ttcn
+ 2
− 2
View file @ cd390132
......@@ -6,8 +6,8 @@
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 307 2017-06-21 08:32:28Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
......
LibOneM2M/OneM2M_Pixits.ttcn
+ 1
− 1
View file @ cd390132
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* $Id: OneM2M_Pixits.ttcn 307 2017-06-21 08:32:28Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
......
LibOneM2M/OneM2M_Templates.ttcn
+ 67
− 67
View file @ cd390132
This diff is collapsed.
LibOneM2M/OneM2M_Types.ttcn
+ 30
− 30
View file @ cd390132
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
* $Id: OneM2M_Types.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* $Id: OneM2M_Types.ttcn 308 2017-06-21 09:44:17Z reinaortega $
* @desc OneM2M data types module
*
*/
......@@ -1623,35 +1623,35 @@ with {
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,
FlexContainerResource_optional flexContainer_optional,
CSEBase_optional cSEBase_optional,
Group_optional group_optional,
GroupAnnc_optional groupAnnc_optional,
LocationPolicy_optional locationPolicy_optional,
LocationPolicyAnnc_optional locationPolicyAnnc_optional,
MgmtResource_optional mgmtResource_optional,//MgmtResource
AnnouncedMgmtResource_optional announcedMgmtResource_optional,//AnnouncedMgmtResource
Node_optional node_optional,
NodeAnnc_optional nodeAnnc_optional,
PollingChannel_optional pollingChannel_optional,
RemoteCSE_optional remoteCSE_optional,
Schedule_optional schedule_optional,
ScheduleAnnc_optional scheduleAnnc_optional,
StatsConfig_optional statsConfig_optional,
StatsCollect_optional statsCollect_optional,
M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile_optional,
ServiceSubscribedAppRule_optional serviceSubscribedAppRule_optional,
Subscription_optional subscription_optional,
SemanticDescriptor_optional semanticDescriptor_optional,
GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance_optional,
AEAnnc_optional aEAnnc,
AE_optional aE,
AccessControlPolicy_optional accessControlPolicy,
AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
ContentInstance_optional contentInstance,
ContentInstanceAnnc_optional contentInstanceAnnc,
Container_optional container,
ContainerAnnc_optional containerAnnc,
FlexContainerResource_optional flexContainer,
CSEBase_optional cSEBase,
Group_optional group_,
GroupAnnc_optional groupAnnc,
LocationPolicy_optional locationPolicy,
LocationPolicyAnnc_optional locationPolicyAnnc,
MgmtResource_optional mgmtResource,//MgmtResource
AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
Node_optional node,
NodeAnnc_optional nodeAnnc,
PollingChannel_optional pollingChannel,
RemoteCSE_optional remoteCSE,
Schedule_optional schedule,
ScheduleAnnc_optional scheduleAnnc,
StatsConfig_optional statsConfig,
StatsCollect_optional statsCollect,
M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
Subscription_optional subscription,
SemanticDescriptor_optional semanticDescriptor,
GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
//SecurityInfo
SecurityInfo securityInfo,
//TS-0004 - 7.5.2-1 Elements used for request content
......
OneM2M_Testcases.ttcn
+ 556
− 556
View file @ cd390132
Source diff could not be displayed: it is too large. Options to address this: view the blob.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment