Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • TST/ATS
1 result
Show changes
Commits on Source (11)
Hide whitespace changes
Inline Side-by-side
Showing
with 4858 additions and 1741 deletions
LibOneM2M/OneM2M_Functions.ttcn
View file @ 24aa5a3a
......@@ -42,6 +42,7 @@ module OneM2M_Functions {
map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
connect(self:infoPort, mtc:infoPort);
f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
......@@ -904,7 +905,8 @@ module OneM2M_Functions {
*/
function f_connectInfoPort(in Tester p_tester) runs on Tester {
// Connect
connect(self:infoPort, p_tester:infoPort);
connect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort connected");
}
/**
......@@ -913,7 +915,8 @@ module OneM2M_Functions {
*/
function f_disconnectInfoPort(in Tester p_tester) runs on Tester {
// Disconnect
disconnect(self:infoPort, p_tester:infoPort);
disconnect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort disconnected");
}
group getFunctions {
......@@ -947,8 +950,6 @@ module OneM2M_Functions {
function f_getRequestPrimitive(in Tester p_component) runs on Tester return RequestPrimitive {
var RequestPrimitive v_request;
f_connectInfoPort(p_component);
p_component.start(f_sendRequestPrimitive());
alt {
[]infoPort.receive(mw_requestPrimitiveforInfoPort) -> value v_request {
......@@ -957,8 +958,6 @@ module OneM2M_Functions {
p_component.done;
f_disconnectInfoPort(p_component);
return v_request;
}
......@@ -1589,7 +1588,7 @@ module OneM2M_Functions {
v_subscribedProfileIndex := f_cse_createResource(int52, p_createServiceSubscribedUserProfile, v_subscriptionProfileIndex);
if (p_allowedUsers == true) {
v_allowedUsers := {p_createServiceSubscribedUserProfile.primitiveContent.serviceSubscribedUserProfile.M2M_User_ID};
v_allowedUsers := {p_createServiceSubscribedUserProfile.primitiveContent.serviceSubscribedUserProfile.m2M_User_ID};
}
v_createServiceSubscribedAppRule := m_createServiceSubscribedAppRule({"None"}, {vc_aeSimuDesc.appId}, p_allowedAEs, valueof(v_allowedUsers));
......@@ -2568,8 +2567,6 @@ module OneM2M_Functions {
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationBase))) -> value vc_request {
tc_ac.stop;
......@@ -2580,8 +2577,9 @@ module OneM2M_Functions {
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
......@@ -2760,7 +2758,7 @@ module OneM2M_Functions {
} //end f_cse_notifyProcedure_aggregatedNotificationHandler
/**
* @desc Handling message exchange for the notification procedure (deletion of subscription resource)
* @desc Handling message exchange for the notification procedure (deletion of subscription/crossResourceSubscription resource)
* @param p_notification Expected notification
* @verdict
*/
......@@ -2804,7 +2802,15 @@ module OneM2M_Functions {
alt {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Non expected notification received");
setverdict(fail, __SCOPE__ & ": ERROR: Non expected notification received");
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationBase))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Non expected notification received");
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
......@@ -2812,14 +2818,14 @@ module OneM2M_Functions {
}
[] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Non expected notification received");
setverdict(fail, __SCOPE__ & ": ERROR: Non expected notification received");
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
setverdict(pass, __SCOPE__ & ": No notification received");
setverdict(pass, __SCOPE__ & ":INFO: No notification received");
}
}
......@@ -4261,6 +4267,12 @@ module OneM2M_Functions {
if(ispresent(p_resource.subscription.dynamicAuthorizationConsultationIDs)) {
vc_localResourcesList[p_localResourceIndex].resource.subscription.dynamicAuthorizationConsultationIDs := p_resource.subscription.dynamicAuthorizationConsultationIDs;
}
if(ispresent(p_resource.subscription.notificationURI)) {
vc_localResourcesList[p_localResourceIndex].resource.subscription.notificationURI := p_resource.subscription.notificationURI;
}
if(ispresent(p_resource.subscription.associatedCrossResourceSub)) {
vc_localResourcesList[p_localResourceIndex].resource.subscription.associatedCrossResourceSub := p_resource.subscription.associatedCrossResourceSub;
}
} else if(ischosen(vc_localResourcesList[p_localResourceIndex].resource.pollingChannel) and (ischosen(p_resource.pollingChannel))) {//pollingChannel
if(ispresent(p_resource.pollingChannel.expirationTime)) {
vc_localResourcesList[p_localResourceIndex].resource.pollingChannel.expirationTime := p_resource.pollingChannel.expirationTime;
......@@ -5602,9 +5614,9 @@ module OneM2M_Functions {
}
}
//creator
if(match(valueof(p_request.primitiveContent.crossResourceSubscription.creator), "NotInitialized" )){
p_request.primitiveContent.crossResourceSubscription.creator := valueof(p_request.from_);
}
//if(match(valueof(p_request.primitiveContent.crossResourceSubscription.creator), "NotInitialized" )){
// p_request.primitiveContent.crossResourceSubscription.creator := valueof(p_request.from_);
//}
}
return valueof(p_request);
......@@ -5778,6 +5790,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.semanticMashupJobProfile)) {
return p_contentResource.semanticMashupJobProfile.resourceID;
}
if(ischosen(p_contentResource.crossResourceSubscription)) {
return p_contentResource.crossResourceSubscription.resourceID;
}
//Announced resources
if(ischosen(p_contentResource.accessControlPolicyAnnc)) {
return f_resourceIdCleaner(p_contentResource.accessControlPolicyAnnc.resourceID);
......@@ -5809,8 +5824,8 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.timeSeriesInstanceAnnc)) {
return p_contentResource.timeSeriesInstanceAnnc.resourceID;
}
if(ischosen(p_contentResource.primitveProfile)) {
return p_contentResource.primitveProfile.resourceID;
if(ischosen(p_contentResource.primitiveProfile)) {
return p_contentResource.primitiveProfile.resourceID;
}
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
......@@ -5899,6 +5914,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.semanticMashupJobProfile)) {
return p_contentResource.semanticMashupJobProfile.resourceName;
}
if(ischosen(p_contentResource.crossResourceSubscription)) {
return p_contentResource.crossResourceSubscription.resourceName;
}
//Announced resources
if(ischosen(p_contentResource.accessControlPolicyAnnc)) {
return p_contentResource.accessControlPolicyAnnc.resourceName;
......@@ -7150,6 +7168,13 @@ module OneM2M_Functions {
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
}
}
case (int48) {
if (isvalue(p_response.primitiveContent.crossResourceSubscription) and
not(ispresent(p_response.primitiveContent.crossResourceSubscription.resourceName))) {
p_response.primitiveContent.crossResourceSubscription.resourceName := p_request.primitiveContent.crossResourceSubscription.resourceName;
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
}
}
case (int61) { // TBD softwareCampaign - implemented similar to exisitng resources
if (isvalue(p_response.primitiveContent.softwareCampaign) and
not(ispresent(p_response.primitiveContent.softwareCampaign.resourceName))) {
......
LibOneM2M/OneM2M_Pixits.ttcn
View file @ 24aa5a3a
......@@ -186,7 +186,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -202,7 +202,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
......@@ -222,7 +222,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -238,7 +238,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
......@@ -261,7 +261,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -277,7 +277,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mccPort := {
binding := {
......@@ -293,7 +293,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mccPortIn := {
binding := {
......@@ -309,7 +309,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE2 := { // CSE2 component settings
......@@ -384,7 +384,7 @@ module OneM2M_Pixits {
}
};
modulepar UrlDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
modulepar UrlDesc PX_TS_UT := { url := "http://127.0.0.1:8080/__ut__" };
modulepar AeSimuComponentDesc PX_TS_DAS := { // DAS component settings
aeIdStem := "",
......
LibOneM2M/OneM2M_Templates.ttcn
View file @ 24aa5a3a
......@@ -113,10 +113,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -154,10 +156,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -198,10 +202,11 @@ module OneM2M_Templates {
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
geoQuery := omit,
level := omit,
offset := omit,
applyRelativePath := omit
applyRelativePath := omit,
geoQuery := omit,
operations := omit
}
};
......@@ -234,10 +239,12 @@ module OneM2M_Templates {
localTokenIDs := *,
tokenRequestIndicator := *,
groupRequestTargetMembers := *,
groupSomecastTargetNumber := *,
authorSignIndicator := *,
authorSigns := *,
authorRelIndicator := *,
semanticQueryIndicator := *,
ontologyMappingResources := *,
releaseVersionIndicator := ?,
vendorInformation := *,
primitiveProfileIdentifier := *,
......@@ -281,10 +288,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -322,10 +331,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -368,10 +379,11 @@ module OneM2M_Templates {
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
geoQuery := omit,
level := omit,
offset := omit,
applyRelativePath := omit
applyRelativePath := omit,
geoQuery := omit,
operations := omit
}
};
......@@ -423,10 +435,11 @@ module OneM2M_Templates {
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
geoQuery := omit,
level := omit,
offset := omit,
applyRelativePath := omit
applyRelativePath := omit,
geoQuery := omit,
operations := omit
}
};
/**
......@@ -465,10 +478,11 @@ module OneM2M_Templates {
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
geoQuery := omit,
level := omit,
offset := omit,
applyRelativePath := omit
applyRelativePath := omit,
geoQuery := omit,
operations := omit
},
desiredIdentifierResultType := p_desIdResType
};
......@@ -509,10 +523,11 @@ module OneM2M_Templates {
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
geoQuery := omit,
level := omit,
offset := omit,
applyRelativePath := omit
applyRelativePath := omit,
geoQuery := omit,
operations := omit
}
};
......@@ -557,10 +572,11 @@ module OneM2M_Templates {
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
geoQuery := omit,
level := omit,
offset := omit,
applyRelativePath := omit
applyRelativePath := omit,
geoQuery := omit,
operations := omit
}
......@@ -596,10 +612,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -632,10 +650,12 @@ module OneM2M_Templates {
localTokenIDs := *,
tokenRequestIndicator := *,
groupRequestTargetMembers := *,
groupSomecastTargetNumber := *,
authorSignIndicator := *,
authorSigns := *,
authorRelIndicator := *,
semanticQueryIndicator := *,
ontologyMappingResources := *,
releaseVersionIndicator := ?,
vendorInformation := *,
primitiveProfileIdentifier := *,
......@@ -702,6 +722,15 @@ module OneM2M_Templates {
primitiveContent:= {accessControlPolicy := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)}
};
/**
* @desc Base UPDATE request primitive for CrossResourceSubscription resource
*/
template (value) RequestPrimitive m_updateCrossResourceSubscriptionBase modifies m_update := {
requestIdentifier := "m_updateCrossResourceSubscription",
primitiveContent:= {crossResourceSubscription := m_contentUpdateCrossResourceSubscription}
};
/**
* @desc Base UPDATE request primitive for GenericInterworkingService resource
*/
......@@ -758,6 +787,13 @@ module OneM2M_Templates {
primitiveContent:= {subscription := m_contentUpdateSubscription}
};
/**
* @desc Base Reception template for update Subscription
*/
template RequestPrimitive mw_updateSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
primitiveContent := {subscription := ?}
};
template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) modifies m_update := {
to_ := p_locResourceAddress,
requestIdentifier := "m_updateLocationPolicy",
......@@ -771,19 +807,23 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_updatePrimitiveProfileBase modifies m_update := {
requestIdentifier := "m_updatePrimitiveProfile",
primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfile}
primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfile}
}
template (value) RequestPrimitive m_updatePrimitiveProfileNonMutuallyExclusive modifies m_updatePrimitiveProfileBase := {
primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNonMutuallyExclusive}
primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNonMutuallyExclusive}
}
template (value) RequestPrimitive m_updatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_updatePrimitiveProfileBase := {
primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions}
}
template (value) RequestPrimitive m_updatePrimitiveProfileNonPermissibleParameters modifies m_updatePrimitiveProfileBase := {
primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNonPermissibleParameters}
primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNonPermissibleParameters}
}
template (value) RequestPrimitive m_updatePrimitiveProfileAddContainerMaxByteNegative modifies m_updatePrimitiveProfileBase := {
primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNegativeMaxByteSize}
primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNegativeMaxByteSize}
}
template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
......@@ -1173,10 +1213,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -1212,10 +1254,12 @@ module OneM2M_Templates {
localTokenIDs := *,
tokenRequestIndicator := *,
groupRequestTargetMembers := *,
groupSomecastTargetNumber := *,
authorSignIndicator := *,
authorSigns := *,
authorRelIndicator := *,
semanticQueryIndicator := *,
ontologyMappingResources := *,
releaseVersionIndicator := ?,
vendorInformation := *,
primitiveProfileIdentifier := *,
......@@ -1226,7 +1270,7 @@ module OneM2M_Templates {
* @desc Base Reception template for create operation for announced resources
*/
template RequestPrimitive mw_createAnnc(template XSD.ID p_from := ?, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := (int10001,int10002,int10003,int10004,int10005, int10009,int10010,int10013,int10014,int10016,int10018,int10024,int10028,int10029,int10030,int10034,int10038,int10039,int10040,int10041,int10042)
resourceType := (int10001,int10002,int10003,int10004,int10005, int10009,int10010,int10013,int10014,int10016,int10018,int10024,int10028,int10029,int10030,int10038,int10039,int10040,int10041,int10042)
}
/**
......@@ -1306,7 +1350,7 @@ module OneM2M_Templates {
primitiveContent := {accessControlPolicyAnnc := m_contentCreateAcpAnnc ()}
};
template (value) RequestPrimitive m_createAcp(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 := {
template (value) RequestPrimitive m_createAcp(in template (omit) ResourceName p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
......@@ -1369,7 +1413,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for DynamicAuthorizationConsultation resource
*/
template (value) RequestPrimitive m_createDynamicAuthorizationConsultationBase(in template (omit) XSD.String p_name, in template (value) XSD.Boolean p_dyn_auth_enabled) modifies m_create := {
template (value) RequestPrimitive m_createDynamicAuthorizationConsultationBase(in template (omit) ResourceName p_name, in template (value) XSD.Boolean p_dyn_auth_enabled) modifies m_create := {
requestIdentifier := testcasename() & "-m_createDynamicAuthorizationConsultation",
resourceType := int34,
primitiveContent := {dynamicAuthorizationConsultation := m_contentDynamicAuthorizationConsultation(p_dyn_auth_enabled, p_name)}
......@@ -1572,7 +1616,7 @@ module OneM2M_Templates {
in template (omit) MemberType p_memberType := omit,
in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
in template (omit) XSD.String p_name := "MyGroup") modifies m_create := {
in template (omit) ResourceName p_name := "MyGroup") modifies m_create := {
requestIdentifier := testcasename() & "-m_createGroup",
resourceType := int9,
primitiveContent := {group_ := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)} //TODO: p_resourceId
......@@ -1708,183 +1752,193 @@ module OneM2M_Templates {
};
/**
* @desc Base CREATE request primitive for PrimitveProfile resource
* @desc Base CREATE request primitive for PrimitiveProfile resource
*/
template (value) RequestPrimitive m_createPrimitveProfileBase modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileBase modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileBase }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileBase }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
*/
template (value) RequestPrimitive m_createPrimitveProfileAddContainerMaxByte100(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByte100(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddContainerMaxByte100(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByte100(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByteNegative(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
*/
template (value) RequestPrimitive m_createPrimitveProfileAddContainerMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByte100ToResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=4, attribute and child resources
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo4(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo4(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo4(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo4(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=4, attribute and child resources
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo4ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo4ToResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitiveProfileModifResultContentTo4ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1, attribute and child resources
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo1(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo1(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1, attribute and child resources
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo1ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1ToResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Delete for ResultContent
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete for ResultContent
*/
template (value) RequestPrimitive m_createPrimitveProfileDelteResultContent(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileDelteResultContent(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteResultContent(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteResultContent(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddgmty(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddgmty(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddgmty(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for non permissible attribute
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
*/
template (value) RequestPrimitive m_createPrimitveProfileAddNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddNonPermissibleAttribute(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddNonPermissibleAttribute(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitiveProfile resource with primitive additions or deletions containing invalid attribute/parametres
*/
template (value) RequestPrimitive m_createPrimitiveProfileWithInvalidAdditionsOrDeletions(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileWithInvalidAdditionsOrDeletions(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for non permissible attribute
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
*/
template (value) RequestPrimitive m_createPrimitveProfileDeleteNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileDeleteNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteNonPermissibleAttribute(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource with non mutually exclusive attributes
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource with non mutually exclusive attributes
*/
template (value) RequestPrimitive m_createPrimitveProfileAddNonMutuallyExclusive(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddNonMutuallyExclusive(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddNonMutuallyExclusive(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddNonMutuallyExclusive(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Delete for Content resource
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete for Content resource
*/
template (value) RequestPrimitive m_createPrimitveProfileDeleteContainerMaxByte(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileDeleteContainerMaxByte(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteContainerMaxByte(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteContainerMaxByte(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
*/
template (value) RequestPrimitive m_createPrimitveProfileAddMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileAddMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddMaxByte100ToResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddMaxByte100ToResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1 from response.
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1 from response.
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1FromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1 from response.
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1 from response.
*/
template (value) RequestPrimitive m_createPrimitiveProfileDeleteResultContentTo1FromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
*/
template (value) RequestPrimitive m_createPrimitveProfileDeleteFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileDeleteFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteFromResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteFromResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
*/
template (value) RequestPrimitive m_createPrimitveProfileDeletePrimtiveContentFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitveProfile",
template (value) RequestPrimitive m_createPrimitiveProfileDeletePrimtiveContentFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(p_IDList) }
primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeletePrimitiveContentFromResponse(p_IDList) }
};
/**
......@@ -1899,7 +1953,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for Dependency resource
*/
template (value) RequestPrimitive m_createDependencyBase(in template (omit) XSD.String p_name := "MyDependency") modifies m_create := {
template (value) RequestPrimitive m_createDependencyBase(in template (omit) ResourceName p_name := "MyDependency") modifies m_create := {
requestIdentifier := testcasename() & "-m_createDependency",
resourceType := int64,
primitiveContent := {dependency := m_contentDependency (p_name)}
......@@ -1908,7 +1962,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for State resource including stateTransitions attribute
*/
template (value) RequestPrimitive m_createStateBase(in template (omit) XSD.String p_name := "MyState") modifies m_create := {
template (value) RequestPrimitive m_createStateBase(in template (omit) ResourceName p_name := "MyState") modifies m_create := {
requestIdentifier := testcasename() & "-m_createStateBase",
resourceType := int65,
primitiveContent := {state := m_contentCreateState (p_name)}
......@@ -1917,7 +1971,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for Action resource
*/
template (value) RequestPrimitive m_createActionBase(in template (omit) XSD.String p_name := "MyAction", template (omit) XSD.AnyURI p_subjectresourceID := omit, template (omit) XSD.AnyURI p_objectresourceID := omit) modifies m_create := {
template (value) RequestPrimitive m_createActionBase(in template (omit) ResourceName p_name := "MyAction", template (omit) XSD.AnyURI p_subjectresourceID := omit, template (omit) XSD.AnyURI p_objectresourceID := omit) modifies m_create := {
requestIdentifier := testcasename() & "-m_createAction",
resourceType := int63,
primitiveContent := {action_ := m_contentAction (p_name, p_subjectresourceID, p_objectresourceID)}
......@@ -1926,7 +1980,7 @@ module OneM2M_Templates {
/**
* @desc CREATE request primitive for State resource including stateTransitions attribute
*/
template (value) RequestPrimitive m_createState(in template (omit) XSD.String p_name := "MyState",
template (value) RequestPrimitive m_createState(in template (omit) ResourceName p_name := "MyState",
in template (omit) State_optional p_state := m_contentCreateState) modifies m_create := {
requestIdentifier := testcasename() & "-m_createState",
resourceType := int65,
......@@ -1936,7 +1990,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for ProcessManagement resource
*/
template (value) RequestPrimitive m_createProcessManagementBase(in template (omit) XSD.String p_name := c_defaultProcessManagementName) modifies m_create := {
template (value) RequestPrimitive m_createProcessManagementBase(in template (omit) ResourceName p_name := c_defaultProcessManagementName) modifies m_create := {
requestIdentifier := testcasename() & "-m_createProcessManagement",
resourceType := int66,
primitiveContent := {processManagement := m_contentProcessManagement (p_name)}
......@@ -1951,7 +2005,7 @@ module OneM2M_Templates {
primitiveContent := {scheduleAnnc := m_contentCreateScheduleAnnc (omit, {{"* * * * * * *"}})}
};
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 := {
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) ResourceName p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
......@@ -2008,7 +2062,7 @@ module OneM2M_Templates {
primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
};
template (value) RequestPrimitive m_createSubscription(template (omit) XSD.ID p_to := omit, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
template (value) RequestPrimitive m_createSubscription(template (omit) XSD.ID p_to := omit, in template (omit) ResourceName p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
to_ := p_to,
requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
......@@ -2085,7 +2139,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createSubscriptionAdvanced( template (omit) XSD.ID p_to := "NotInitialized",
in template (omit) XSD.String p_name := omit,
in template (omit) ResourceName p_name := omit,
in template (value) ListOfURIs p_notificationURI := {"NotInitialized"},
in template (omit) EventNotificationCriteria p_eventNotificationCriteria := omit,
in template (omit) XSD.PositiveInteger p_expirationCounter := omit,
......@@ -2270,7 +2324,7 @@ module OneM2M_Templates {
primitiveContent := {timeSeriesAnnc := m_contentCreateTimeSeriesAnnc}
};
template (value) RequestPrimitive m_createTimeSeries(in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName,
template (value) RequestPrimitive m_createTimeSeries(in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName,
in XSD.Boolean p_missingDataDetect := true,
in XSD.NonNegativeInteger p_periodicInterval := 5000,
in XSD.NonNegativeInteger p_missingDataMaxNr := 5,
......@@ -2295,7 +2349,7 @@ module OneM2M_Templates {
primitiveContent := {timeSeriesInstance := m_contentCreateTimeSeriesInstance()}
};
template (value) RequestPrimitive m_createTimeSeriesInstance(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultTimeSeriesInstanceResourceName) modifies m_create := {
template (value) RequestPrimitive m_createTimeSeriesInstance(XSD.ID p_parentResourceAddress, in template (omit) ResourceName p_name := c_defaultTimeSeriesInstanceResourceName) modifies m_create := {
to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createTimeSeriesInstance",
resourceType := int30,
......@@ -2771,12 +2825,12 @@ module OneM2M_Templates {
primitiveContent := {crossResourceSubscription := m_contentCreateCrossResourceSubscription ({"NotInitialized"}, -, -, omit)}
};*/
template (value) RequestPrimitive m_createCrossResourceSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultCrossResourceSubscriptionResourceName, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"},
in template (omit) TimeWindowType p_timeWindowType, in template (value) AbsRelTimestamp p_timeWindowSize, in template (value) XSD.ID p_creator) modifies m_create := {
template (value) RequestPrimitive m_createCrossResourceSubscription(XSD.ID p_parentResourceAddress, in template (omit) ResourceName p_name := c_defaultCrossResourceSubscriptionResourceName, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"},
in template (omit) TimeWindowType p_timeWindowType := int1, in template (value) XSD.Duration p_timeWindowSize) modifies m_create := {
to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createCrossResourceSubscription",
resourceType := int48,
primitiveContent := {crossResourceSubscription := m_contentCreateCrossResourceSubscription (p_notificationURI, p_name, p_timeWindowType, p_timeWindowSize, p_creator)}
primitiveContent := {crossResourceSubscription := m_contentCreateCrossResourceSubscription (p_notificationURI, p_name, p_timeWindowType, p_timeWindowSize)}
};
}//end group Create
......@@ -2808,10 +2862,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -2849,10 +2905,12 @@ module OneM2M_Templates {
localTokenIDs := *,
tokenRequestIndicator := *,
groupRequestTargetMembers := *,
groupSomecastTargetNumber := *,
authorSignIndicator := *,
authorSigns := *,
authorRelIndicator := *,
semanticQueryIndicator := *,
ontologyMappingResources := *,
releaseVersionIndicator := ?,
vendorInformation := *,
primitiveProfileIdentifier := *,
......@@ -2899,10 +2957,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -2953,10 +3013,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -2991,10 +3053,12 @@ module OneM2M_Templates {
localTokenIDs := *,
tokenRequestIndicator := *,
groupRequestTargetMembers := *,
authorSignIndicator := *,
authorSigns := *,
authorRelIndicator := *,
semanticQueryIndicator := *,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := ?,
vendorInformation := *,
primitiveProfileIdentifier := *,
......@@ -3134,6 +3198,7 @@ module OneM2M_Templates {
expirationTime := "20301231T012345",//MA
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA
location := omit,//OA
appName := omit,//OA
app_ID := p_appId,//OA
aE_ID := omit,//OA
......@@ -3171,6 +3236,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := *, //OA O
location := *,//OA O
appName := *,//OA O
app_ID := *,//OA M
aE_ID := *,//OA M
......@@ -3208,6 +3274,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA O
location := *,//OA O
cseType := *,//OA O
pointOfAccess := *,//OA O
cSEBase := *,//OA M
......@@ -3230,8 +3297,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAe1ResourceName, in XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) ResourceName p_name := c_defaultAe1ResourceName, in XSD.String p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -3242,9 +3308,12 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
announceSyncType := omit,//O
location := omit,//O
appName := omit,//O
app_ID := p_appId,//M
aE_ID := omit,//NP
pointOfAccess := p_poaList, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"},
......@@ -3260,6 +3329,7 @@ module OneM2M_Templates {
sessionCapabilities := omit, //O
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
choice := omit//NP
};
......@@ -3278,9 +3348,12 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
appName := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
appName := *,//O
app_ID := ?,//M
aE_ID := omit,//NP
pointOfAccess := *, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"},
......@@ -3296,6 +3369,7 @@ module OneM2M_Templates {
sessionCapabilities := *, //O
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
choice := *//NP
};
......@@ -3305,7 +3379,7 @@ module OneM2M_Templates {
* @param p_acor Allowed originators
* @param p_allowedOperations Allowed operations
*/
template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) ResourceName p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -3316,6 +3390,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
privileges := {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M
......@@ -3383,7 +3458,8 @@ module OneM2M_Templates {
accessControlOperations := p_allowedOperations,
accessControlContexts_list := omit,
accessControlAuthenticationFlag := omit,
accessControlObjectDetails_list := omit
accessControlObjectDetails_list := omit,
accessControlAttributes := omit
}
/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
......@@ -3427,9 +3503,11 @@ module OneM2M_Templates {
pointOfAccess := {"NotInitialized"},
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
location := omit,
contentSerialization := omit,
e2eSecInfo := omit,
supportedReleaseVersions := {"1", "2", "2a", "3"},
currentTime := omit,
choice := omit
};
......@@ -3437,7 +3515,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for CSEBase resource
* @param p_name Resource name
*/
template (value) CSEBase_optional m_contentCreateCSEBase (in template (omit) XSD.String p_name := c_defaultResourceName):= {
template (value) CSEBase_optional m_contentCreateCSEBase (in template (omit) ResourceName p_name := c_defaultResourceName):= {
resourceName := p_name,//O
resourceType := omit,
resourceID := omit,
......@@ -3452,9 +3530,11 @@ module OneM2M_Templates {
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
location := omit,
contentSerialization := omit,
e2eSecInfo := omit,
supportedReleaseVersions := {"1", "2", "2a", "3"},
currentTime := omit,
choice := omit
};
......@@ -3470,16 +3550,10 @@ module OneM2M_Templates {
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := p_labels,//MA O
accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
expirationTime := "29991231T235959",//MA M
link := p_link,//M
accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
cseType := omit,//OA O
cSE_ID := omit,//OA M
supportedResourceType := omit,//OA M
pointOfAccess := omit,//OA O
nodeLink := omit,//OA O
dynamicAuthorizationConsultationIDs := omit,//OA O
contentSerialization := omit,//OA O
e2eSecInfo := omit,//OA O
supportedReleaseVersions := {"1", "2", "2a", "3"}, //MA M Mandatory for RemoteCSE from Release 2
choice := omit//NA
......@@ -3497,16 +3571,10 @@ module OneM2M_Templates {
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := p_labels,//MA O
accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
expirationTime := ?,//MA M
link := p_link,//M
accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
cseType := *,//OA O
cSE_ID := *,//OA M
supportedResourceType := ?,//OA M
pointOfAccess := *,//OA O
nodeLink := *,//OA O
dynamicAuthorizationConsultationIDs := *,//OA O
contentSerialization := *,//OA O
e2eSecInfo := ?,//OA O
supportedReleaseVersions := ?, //MA M Mandatory for RemoteCSE from Release 2
choice := omit//NA
......@@ -3517,7 +3585,7 @@ module OneM2M_Templates {
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
template (value) Delivery_optional m_contentCreateDelivery (in template (omit) XSD.String p_name := c_defaultDeliveryResourceName,
template (value) Delivery_optional m_contentCreateDelivery (in template (omit) ResourceName p_name := c_defaultDeliveryResourceName,
in template (omit) AcpType p_accessControlPolicyIds,
in template (value) XSD.ID p_source,
in template (value) XSD.ID p_target,
......@@ -3535,6 +3603,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
source := p_source,//M
target := p_target,//M
lifespan := p_lifespan,//M
......@@ -3550,7 +3619,7 @@ module OneM2M_Templates {
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
template (value) GenericInterworkingService_optional m_contentCreateGenericInterworkingService (in template (omit) XSD.String p_name := c_defaultGenericInterworkingServiceResourceName,
template (value) GenericInterworkingService_optional m_contentCreateGenericInterworkingService (in template (omit) ResourceName p_name := c_defaultGenericInterworkingServiceResourceName,
in template (omit) AcpType p_accessControlPolicyIds := omit) := {
resourceName := p_name,//O
......@@ -3590,7 +3659,7 @@ module OneM2M_Templates {
in template (omit) MemberType p_memberType := omit,
in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
in template (omit) XSD.String p_name := c_defaultGroupResourceName,
in template (omit) ResourceName p_name := c_defaultGroupResourceName,
in template (omit) XSD.Boolean p_semanticSupportIndicator := true) := {
resourceName := p_name,//O
resourceType := omit,//NP
......@@ -3602,8 +3671,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//O
memberType := p_memberType,//O
specializationType := omit,//O
......@@ -3616,6 +3687,8 @@ module OneM2M_Templates {
groupName := omit,//O
semanticSupportIndicator := omit,//O
notifyAggregation := omit,//O
somecastEnable := omit,//O
somecastAlgorithm := omit,//O
choice := omit//NP
};
......@@ -3638,8 +3711,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
creator := *,//O
memberType := *,//O
specializationType := *,//O
......@@ -3652,6 +3727,8 @@ module OneM2M_Templates {
groupName := *,//O
semanticSupportIndicator := *,//O
notifyAggregation := *,//O
somecastEnable := *,//O
somecastAlgorithm := *,//O
choice := omit//NP
};
......@@ -3691,6 +3768,8 @@ module OneM2M_Templates {
groupName := omit,//O
semanticSupportIndicator := omit,//O
notifyAggregation := omit,//O
somecastEnable := omit,//O
somecastAlgorithm := omit,//O
choice := omit//NP
};
......@@ -3720,6 +3799,8 @@ module OneM2M_Templates {
groupName := *,//OA O
semanticSupportIndicator := *,//OA O
notifyAggregation := *,//OA O
somecastEnable := omit,//O
somecastAlgorithm := omit,//O
choice := omit //NA
};
......@@ -3728,7 +3809,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
template (value) MgmtResource_optional m_contentCreateMgmtObj (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) XSD.String p_name := c_defaultMgmtObjResourceName) := {
template (value) MgmtResource_optional m_contentCreateMgmtObj (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) ResourceName p_name := c_defaultMgmtObjResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
......@@ -3740,8 +3821,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
mgmtDefinition := omit,//O
objectIDs := omit,//O
objectPaths := omit,//O
......@@ -3754,7 +3837,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
template (value) MgmtResource_optional m_contentCreateMgmtCmd (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) XSD.String p_name := c_defaultMgmtCmdResourceName) := {
template (value) MgmtResource_optional m_contentCreateMgmtCmd (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) ResourceName p_name := c_defaultMgmtCmdResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
......@@ -3766,8 +3849,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
mgmtDefinition := omit,//O
objectIDs := omit,//O
objectPaths := omit,//O
......@@ -3802,7 +3887,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
template (value) Node_optional m_contentCreateNode (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) XSD.String p_name := c_defaultNodeResourceName, in template (omit) XSD.ID p_nodeId := "NodeID") := {//TODO Create PX for NodeID
template (value) Node_optional m_contentCreateNode (in template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) ResourceName p_name := c_defaultNodeResourceName, in template (omit) NodeID p_nodeId := "NodeID") := {//TODO Create PX for NodeID
resourceName := p_name,//O
resourceType := omit,//NP
......@@ -3814,9 +3899,12 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
nodeID := p_nodeId,//M
nodeType := omit,//O
hostedCSELink := omit,//O
hostedAELinks := omit,//O
hostedServiceLinks := omit,//O
......@@ -3830,7 +3918,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for Node resource
* @param p_name Resource name
*/
template Node_optional mw_contentCreateNodeBase (template XSD.String p_name := *) := {
template Node_optional mw_contentCreateNodeBase (template ResourceName p_name := *) := {
resourceName := p_name,//O
resourceType := omit,//NP
......@@ -3842,9 +3930,12 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
nodeID := ?,//M
nodeType := *,//O
hostedCSELink := *,//O
hostedAELinks := *,//O
hostedServiceLinks := *,//O
......@@ -3887,7 +3978,7 @@ module OneM2M_Templates {
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) XSD.String p_name := c_defaultPollingChannelResourceName) := {
template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) ResourceName p_name := c_defaultPollingChannelResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -3896,6 +3987,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit//NP
};
......@@ -3913,6 +4005,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := *,//O
expirationTime := *,//O
requestAggregation := *,//O
choice := omit//NP
};
......@@ -3922,7 +4015,7 @@ module OneM2M_Templates {
* @param p_name Resource name
*/
template (value) TransactionMgmt_optional m_contentCreateTransactionMgmt ( in template (omit) AggregatedRequest p_requestPrimitives,
in template (omit) XSD.String p_name := c_defaultTransactionMgmtResourceName,
in template (omit) ResourceName p_name := c_defaultTransactionMgmtResourceName,
in template (omit) TransactionState p_transactionState := int1) := {
resourceName := p_name,//O p_name
resourceType := omit,//NP
......@@ -3934,6 +4027,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit, //O
transactionLockTime := omit, //O
transactionExecuteTime := omit, //O
......@@ -3957,7 +4051,7 @@ module OneM2M_Templates {
* @param p_name Resource name
*/
template (value) Transaction_optional m_contentCreateTransaction ( in template (value) RequestPrimitive p_requestPrimitive ,
in template (omit) XSD.String p_name := c_defaultTransactionMgmtResourceName,
in template (omit) ResourceName p_name := c_defaultTransactionMgmtResourceName,
in template (omit) TransactionControl p_transactionControl := int2) := {
resourceName := p_name,//O p_name
resourceType := omit,//NP
......@@ -3969,6 +4063,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit, //O
transactionID := omit,
transactionControl := p_transactionControl,
......@@ -3983,30 +4078,30 @@ module OneM2M_Templates {
};
/**
* @desc Base template primitiveContent for CREATE operation for PrimitveProfile resource
* @desc Base template primitiveContent for CREATE operation for PrimitiveProfile resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
accessControlPolicyIDs := omit,//O
creationTime := omit,//NP
expirationTime := omit,//O
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
creator := omit,//O
IDList := omit,//M
announceSyncType := omit,//O
iDList := omit,//M
resourceTypes := omit,//O
operations := omit,//O
resourceIDs := omit,//O
releaseVersions := omit,//O
additions := omit,//O
deletions := omit,//O
modifications := omit,//O
applicability := omit,//O
choice := omit//NP
};
......@@ -4014,230 +4109,244 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"maxByteSize", "100"}}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
//additions := {{{"maxByteSize", "100"}}}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"maxByteSize", "-100"}}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"mbs", {XSD.Integer := -100}}}}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"geoCoordinates", "type_:=1, coordinates:={-4.4216366, 36.7213028}"}},//6.3.5.69 m2m:geoCoordinates
applicability := REQUESTS_TO_CSE
additions := {{{"geoCoordinates", "type_:=1, coordinates:={-4.4216366, 36.7213028}"}}},//6.3.5.69 m2m:geoCoordinates
applicability := int1
};
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"maxByteSize", "100"}}, //O
applicability := RESPONSES_FROM_CSE
additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
applicability := int2
};
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"resultContent", "4"}}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"rcn", {XSD.Integer := 4}}}}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"resultContent", "4"}}, //O
applicability := RESPONSES_FROM_CSE
additions := {{{"rcn", {XSD.Integer := 4}}}}, //O
applicability := int2
};
/**
* @desc Primitive Profile for modification of resultContent primitive of container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
modifications := {{"resultContent", "4"}}, //O
applicability := RESPONSES_FROM_CSE
additions := {{{"rcn", {XSD.Integer := 4}}}}, //O
applicability := int2
};
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"resultContent", "1"}}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"rcn", {XSD.Integer := 1}}}}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"resultContent", "1"}}, //O
applicability := RESPONSES_FROM_CSE
additions := {{{"rcn", {XSD.Integer := 1}}}}, //O
applicability := int2
};
/**
* @desc Primitive Profile for removing resultContent primitive of container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"resultContent"}}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"rcn"}}}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding a non permissible attribute
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"releaseVersionIndicator", "3"}}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"rvi", {XSD.String := "3"}}}}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding a invalid value in additions/deletions attribute
*/
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileWithInvalidAdditionsOrDeletions(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{{"invalidAttributeAdd", "3"}}}, //O
deletions := {"invalidAttributedDelete"}, //O
applicability := int1
};
/**
* @desc Primitive Profile for deleting a non permissible attribute
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
deletions := {"requestIdentifier"}, //O
applicability := REQUESTS_TO_CSE
deletions := {"rqi"}, //O
applicability := int1
};
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource in a non mutually exclusive way
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"maxByteSize", "100"}}, //O
deletions := {"maxByteSize"}, //O
applicability := REQUESTS_TO_CSE
additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
deletions := {"mbs"}, //O
applicability := int1
};
/**
* @desc Primitive Profile for deleting MaxByte primitive of Container resource
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
deletions := {"maxByteSize"}, //O
applicability := REQUESTS_TO_CSE
deletions := {"mbs"}, //O
applicability := int1
};
/**
* @desc Primitive Profile for deleting MaxByte primitive of Resoponse Content
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
deletions := {"maxByteSize"}, //O
applicability := RESPONSES_FROM_CSE
deletions := {"mbs"}, //O
applicability := int2
};
/**
* @desc Primitive Profile for deleting MaxByte primitive of Resoponse Content
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
deletions := {"primitiveContent"}, //O
applicability := RESPONSES_FROM_CSE
deletions := {"pc"}, //O
applicability := int2
};
/**
* @desc Primitive Profile for adding MaxByte primitive to Resoponse Content
*/
template PrimitveProfile_optional m_contentCreatePrimitveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"maxByteSize", "100"}}, //O
applicability := RESPONSES_FROM_CSE
additions := {{{"mbs", {XSD.NonNegativeInteger := 100}}}}, //O
applicability := int2
};
/**
* @desc Primitive Profile for adding resultContent primitive to Resoponse Content
*/
template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
additions := {{"resultContent", "1"}}, //O
applicability := RESPONSES_FROM_CSE
additions := {{{"rcn", {XSD.Integer := 1}}}}, //O
applicability := int2
};
/**
* @desc Primitive Profile for deleting resultContent primitive to Response Content
*/
template PrimitveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
IDList := p_IDList, //M
iDList := p_IDList, //M
resourceTypes := {int3}, //O
operations := {int1, int2, int3, int4, int5},//O
deletions := {"resultContent"}, //O
applicability := RESPONSES_FROM_CSE
deletions := {"rcn"}, //O
applicability := int2
};
/**
......@@ -4246,7 +4355,7 @@ module OneM2M_Templates {
* @param p_name Resource name
*/
template (value) Schedule_optional m_contentCreateSchedule (in template (value) ScheduleEntries p_scheduleElement := {{"* * * * * * *"}},
in template (omit) XSD.String p_name := c_defaultScheduleResourceName) := {
in template (omit) ResourceName p_name := c_defaultScheduleResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4257,8 +4366,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
scheduleElement := p_scheduleElement,//M
networkCoordinated := omit,//O
choice := omit//NP
......@@ -4268,7 +4379,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for State_optional resource
* @param p_scheduleElement Schedule
*/
template (value) State_optional m_contentCreateState (in template (omit) XSD.String p_name := "MyState") := {
template (value) State_optional m_contentCreateState (in template (omit) ResourceName p_name := "MyState") := {
resourceName := p_name,//O,
resourceType := omit,//NP,
resourceID := omit,//NP,
......@@ -4279,11 +4390,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O,
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
holder := omit,//O
announceTo := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//O
stateActive := omit,//NP
stateAction := omit,//NP
stateTransitions := omit,//O
......@@ -4295,20 +4405,19 @@ module OneM2M_Templates {
* @param EvalCriteria p_evalCriteria
* @param XSD.AnyURI p_nextState
*/
template (value) StateTransitions_optional m_stateTransitions (in template (value) EvalCriteria p_evalCriteria,
template (value) ListOfStateTransitions m_stateTransitions (in template (value) EvalCriteria p_evalCriteria,
in template (value) XSD.AnyURI p_nextState) := {
evalCriteria := p_evalCriteria,
nextState := p_nextState
stateTransition_list := {{evalCriteria := p_evalCriteria, nextState := p_nextState}}
};
/**
* @desc Fields for State_optional resource
* @param XSD.String p_name
* @param ResourceName p_name
* @param StateTransitions_optional p_stateTransitions
*/
template (value) State_optional m_contentCreateStateWithStateTransitions (in template (omit) XSD.String p_name := "MyState",
in template (omit) StateTransitions_optional p_stateTransitions := omit) := {
template (value) State_optional m_contentCreateStateWithStateTransitions (in template (omit) ResourceName p_name := "MyState",
in template (omit) ListOfStateTransitions p_stateTransitions := omit) := {
resourceName := p_name,//O,
resourceType := omit,//NP,
resourceID := omit,//NP,
......@@ -4319,40 +4428,38 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O,
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
holder := omit,//O
announceTo := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//O
stateActive := omit,//NP
stateAction := omit,//NP
stateTransitions := {p_stateTransitions},//O
stateTransitions := p_stateTransitions,//O
choice := omit//O
};
/**
* @desc Base primitiveContent for CREATE operation for ProcessManagement_optional including a State resource
* @param XSD.String p_name
* @param ResourceName p_name
* @param StateTransitions_optional p_stateTransitions
*/
template (value) ProcessManagement_optional m_contentProcessManagement_WithState (in template (omit) XSD.String p_name := "MyState",
in template (omit) State_optional p_state := m_contentCreateState) := {
template (value) ProcessManagement_optional m_contentProcessManagement_WithState (in template (omit) ResourceName p_name := "MyState",
in template (value) State_optional p_state := m_contentCreateState) := {
resourceName := p_name,//O,
resourceType := omit,//NP,
resourceID := omit,//NP,
parentID := omit,//NP,
accessControlPolicyIDs := omit,//NP,
creationTime := omit,//NP,
expirationTime := omit,//O
lastModifiedTime := omit,//NP,
labels := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
accessControlPolicyIDs := omit,//NP,
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
creator := omit,//O
holder := omit,//O
announceSyncType := omit,//O
processStatus := omit,//NP,
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
processStatus := omit,//NP,
processControl := omit,//NP,
currentState := omit,//NP,
activateConditions:= omit,//NP,
......@@ -4363,25 +4470,24 @@ module OneM2M_Templates {
/**
* @desc Base primitiveContent for CREATE operation for ProcessManagement_optional resource
* @param XSD.String p_name
* @param ResourceName p_name
*/
template (value) ProcessManagement_optional m_contentProcessManagement (in template (omit) XSD.String p_name := c_defaultProcessManagementName) := {
template (value) ProcessManagement_optional m_contentProcessManagement (in template (omit) ResourceName p_name := c_defaultProcessManagementName) := {
resourceName := p_name,//O,
resourceType := omit,//NP,
resourceID := omit,//NP,
parentID := omit,//NP,
accessControlPolicyIDs := omit,//NP,
creationTime := omit,//NP,
expirationTime := omit,//O
lastModifiedTime := omit,//NP,
labels := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
accessControlPolicyIDs := omit,//NP,
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
creator := omit,//O
holder := omit,//O
announceSyncType := omit,//O
processStatus := omit,//NP,
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
processStatus := omit,//NP,
processControl := omit,//NP,
currentState := omit,//NP,
activateConditions:= omit,//NP,
......@@ -4392,9 +4498,9 @@ module OneM2M_Templates {
/**
* @desc Base primitiveContent for CREATE operation for Action resource
* @param XSD.String p_name
* @param ResourceName p_name
*/
template (value) Action_optional m_contentAction (in template (omit) XSD.String p_name := "MyAction", in template (omit) XSD.AnyURI p_subjectresourceID := omit, in template (omit) XSD.AnyURI p_objectresourceID := omit) := {
template (value) Action_optional m_contentAction (in template (omit) ResourceName p_name := "MyAction", in template (omit) XSD.AnyURI p_subjectresourceID := omit, in template (omit) XSD.AnyURI p_objectresourceID := omit) := {
resourceName := p_name,//O,
resourceType := omit,//NP,
resourceID := omit,//NP,
......@@ -4405,12 +4511,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//NP,
expirationTime := omit,//O,
dynamicAuthorizationConsultationIDs := omit,//O,
holder := omit,//O,
announceTo := omit,//O,
announceSyncType := omit,//O,
custodian := omit,//O
announceTo := omit,//O,
announcedAttribute := omit,//O,
creator := omit,//O,
actionPriority := omit,//O,
announceSyncType := omit,//O
actionPriority := omit,//O,
subjectResourceID := p_subjectresourceID,//O,
evalCriteria := omit,//O,
evalMode := omit,//O,
......@@ -4425,9 +4530,9 @@ module OneM2M_Templates {
/**
* @desc Base primitiveContent for CREATE operation for Dependency_optional resource
* @param XSD.String p_name
* @param ResourceName p_name
*/
template (value) Dependency_optional m_contentDependency (in template (omit) XSD.String p_name := "MyDependency") := {
template (value) Dependency_optional m_contentDependency (in template (omit) ResourceName p_name := "MyDependency") := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4438,11 +4543,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//NP
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
holder := omit,//O
announceTo := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//O
sufficient := omit,//O
evalCriteria := omit,//O
referencedResourceID := omit,//O
......@@ -4463,8 +4567,8 @@ module OneM2M_Templates {
labels := omit,//MA O
accessControlPolicyIDs := omit,//NA O
expirationTime := "29991231T235959",//MA M
dynamicAuthorizationConsultationIDs := omit,//NA O
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit,//NA O
scheduleElement := p_scheduleEntries,//OA M
networkCoordinated := omit,//OA O
choice := omit//NP
......@@ -4483,8 +4587,8 @@ module OneM2M_Templates {
labels := *,//MA O
accessControlPolicyIDs := omit,//NA O
expirationTime := ?,//MA M
dynamicAuthorizationConsultationIDs := omit,//NA O
link := ?,//M
dynamicAuthorizationConsultationIDs := omit,//NA O
scheduleElement := * ,//OA M
networkCoordinated := *,//OA O
choice := omit//NP
......@@ -4501,6 +4605,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
applicableCredIDs := p_applicableCredIDs,//O
allowedApp_IDs := p_allowedAppIDs,//O
allowedAEs := p_allowedAEs,//O
......@@ -4514,7 +4619,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for StatsConfig resource
* @param p_name Resource name
*/
template (value) StatsConfig_optional m_contentCreateStatsConfig (in template (omit) XSD.String p_name := c_defaultStatsConfigResourceName) := {
template (value) StatsConfig_optional m_contentCreateStatsConfig (in template (omit) ResourceName p_name := c_defaultStatsConfigResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4525,6 +4630,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
creator := omit,//O
choice := omit//O
};
......@@ -4536,7 +4642,7 @@ module OneM2M_Templates {
* @param p_name Resource name
*/
template (value) Subscription_optional m_contentCreateSubscription (in template (value) ListOfURIs p_notificationURI,
in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName) := {
in template (omit) ResourceName p_name := c_defaultSubscriptionResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4547,6 +4653,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -4563,6 +4670,9 @@ module OneM2M_Templates {
notificationEventCat := omit,//O
subscriberURI := omit,//O
associatedCrossResourceSub := omit,//O
notificationStatsEnable := omit,//O
notificationStatsInfo := omit,//O
primitiveProfileID := omit,//O
choice := omit//NP
};
......@@ -4578,8 +4688,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit, //NP
creator := omit, //O
choice := omit //NP
......@@ -4598,8 +4710,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit,//O
creator := omit, //O
description := omit, //O
ontologyFormat := p_ontologyFormat, //M
......@@ -4624,8 +4739,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
creator := omit, //O
descriptorRepresentation := p_descriptorRepresentation, //M
semanticOpExec := omit, //NP
......@@ -4652,8 +4769,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *, //O
expirationTime := *, //O
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *, //O
announcedAttribute := *, //O
announceSyncType := *,//O
creator := *, //O
descriptorRepresentation := ?, //M
semanticOpExec := omit, //NP
......@@ -4683,14 +4802,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit,//O
creator := omit, //O
memberFilter := p_memberFilter, //M
smiID := omit, //O
inputDescriptor := omit, //O
outputDescriptor := p_outputDescriptor, //M
functionDescriptor := p_functionDescriptor //M
functionDescriptor := p_functionDescriptor, //M
choice := omit//O
}
/**
......@@ -4708,14 +4832,18 @@ module OneM2M_Templates {
accessControlPolicyIDs := *, //O
expirationTime := *, //O
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *, //O
announcedAttribute := *, //O
announceSyncType := omit,//O
stateTag := *,//O
creator := *, //O
memberFilter := ?, //M
smiID := *, //O
inputDescriptor := *, //O
outputDescriptor := ?, //M
functionDescriptor := ? //M
functionDescriptor := ?, //M
choice := *//O
}
......@@ -4737,15 +4865,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit,//O
creator := omit, //O
smjpID := p_smjpID, //M
smjpInputParameter := p_smjpInputParameter, //M
memberStoreType := p_memberStoreType, //M
mashupMember := omit, //O
resultGenType := p_mashupMember, //M
periodForResultGen := omit //O
periodForResultGen := omit, //O
choice := omit//O
}
/**
......@@ -4763,15 +4895,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := *, //O
expirationTime := *, //O
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *, //O
announcedAttribute := *, //O
announceSyncType := omit,//O
stateTag := *,//O
creator := *, //O
smjpID := ?, //M
smjpInputParameter := ?, //M
memberStoreType := ?, //M
mashupMember := *, //O
resultGenType := ?, //M
periodForResultGen := * //O
periodForResultGen := *, //O
choice := *//O
}
......@@ -4790,12 +4926,13 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //NP
expirationTime := omit, //NP
dynamicAuthorizationConsultationIDs := omit, //NP
announceTo := omit, //NP
announcedAttribute := omit, //NP
custodian := omit,//O
stateTag := omit,//O
creator := omit, //NP
smjpInputParameter := omit, //NP
mashupResultFormat := omit, //NP
mashupResult := omit //NP
mashupResult := omit, //NP
choice := omit//O
}
/**
......@@ -4813,12 +4950,13 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //NP
expirationTime := omit, //NP
dynamicAuthorizationConsultationIDs := omit, //NP
announceTo := omit, //NP
announcedAttribute := omit, //NP
custodian := omit,//O
stateTag := omit,//O
creator := omit, //NP
smjpInputParameter := omit, //NP
mashupResultFormat := omit, //NP
mashupResult := omit //NP
mashupResult := omit, //NP
choice := omit//O
}
......@@ -4827,7 +4965,7 @@ module OneM2M_Templates {
* @param p_notificationURI Notification URI
* @param p_name Resource name
*/
template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
template Subscription_optional mw_contentCreateSubscriptionBase (template ResourceName p_name := *) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4838,6 +4976,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
......@@ -4854,11 +4993,14 @@ module OneM2M_Templates {
notificationEventCat := *,//O
subscriberURI := *,//O
associatedCrossResourceSub := *,//O
notificationStatsEnable := *,//O
notificationStatsInfo := *,//O
primitiveProfileID := *,//O
choice := *//O
};
template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
in template (omit) ResourceName p_name := c_defaultSubscriptionResourceName,
in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
in template (omit) XSD.PositiveInteger p_expirationCounter,
in template (omit) BatchNotify p_batchNotify,
......@@ -4941,7 +5083,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for ContentInstance resource
* @param p_primitiveContent Content for the ContentInstance
*/
template (value) ContentInstance_optional m_contentCreateContentInstance(in template (omit) XSD.String p_name := c_defaultContentInstanceResourceName, XSD.String p_primitiveContent := "AnyValue") := {
template (value) ContentInstance_optional m_contentCreateContentInstance(in template (omit) ResourceName p_name := c_defaultContentInstanceResourceName, XSD.String p_primitiveContent := "AnyValue") := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4952,6 +5094,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
contentInfo := "text/strings:0",//O
......@@ -4959,6 +5102,7 @@ module OneM2M_Templates {
contentRef := omit, //O
ontologyRef := omit,//O
content := p_primitiveContent,//M
deletionCnt := omit,//O
choice := omit //O
};
......@@ -4966,7 +5110,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for ContentInstance resource
* @param p_primitiveContent Content for the ContentInstance
*/
template ContentInstance_optional mw_contentCreateContentInstanceBase(template XSD.String p_name := *) := {
template ContentInstance_optional mw_contentCreateContentInstanceBase(template ResourceName p_name := *) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -4977,6 +5121,7 @@ module OneM2M_Templates {
expirationTime := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := *,//O
contentInfo := *,//O
......@@ -4984,6 +5129,7 @@ module OneM2M_Templates {
contentRef := *, //O
ontologyRef := *,//O
content := ?,//M
deletionCnt := *,//O
choice := * //O
};
......@@ -5045,8 +5191,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
location := omit,//O
......@@ -5066,7 +5214,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for Container resource
* @param p_name Resource name
*/
template (value) Container_optional m_contentCreateContainer (in template (omit) XSD.String p_name := c_defaultContainerResourceName) modifies m_contentCreateContainerBase:= {
template (value) Container_optional m_contentCreateContainer (in template (omit) ResourceName p_name := c_defaultContainerResourceName) modifies m_contentCreateContainerBase:= {
resourceName := p_name//O
};
......@@ -5082,7 +5230,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for DynamicAuthorizationConsultation resource
* @param p_name Resource name
*/
template (value) DynamicAuthorizationConsultation_optional m_contentDynamicAuthorizationConsultation (in template (value) XSD.Boolean p_dyn_auth_enabled, in template (omit) XSD.String p_name := c_dynamicAuthorizationConsultationName):= {
template (value) DynamicAuthorizationConsultation_optional m_contentDynamicAuthorizationConsultation (in template (value) XSD.Boolean p_dyn_auth_enabled, in template (omit) ResourceName p_name := c_dynamicAuthorizationConsultationName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -5093,6 +5241,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
dynamicAuthorizationEnabled := p_dyn_auth_enabled,//M
dynamicAuthorizationPoA := omit,//O
dynamicAuthorizationLifetime := omit,//O
......@@ -5118,6 +5267,7 @@ module OneM2M_Templates {
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit, //O
stateTag := omit,//NP
location := omit, //O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
......@@ -5133,7 +5283,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for Container resource
* @param p_name Resource name
*/
template Container_optional mw_contentCreateContainerBase (template XSD.String p_name := *):= {
template Container_optional mw_contentCreateContainerBase (template ResourceName p_name := *):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -5144,8 +5294,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
location := *,//O
......@@ -5164,7 +5316,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
* @param p_name Resource name
*/
template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) ResourceName p_name := c_defaultContainerResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -5176,10 +5328,13 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
location := omit, //O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
......@@ -5195,7 +5350,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for RemoteCSE resource
* @param p_name Resource name
*/
template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId):= {
template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) ResourceName p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -5206,8 +5361,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
cseType := omit,//O
pointOfAccess := omit,//O
cSEBase := valueof(p_cSEBase),//M
......@@ -5225,6 +5383,7 @@ module OneM2M_Templates {
externalGroupID := omit,//O
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
choice := omit//O
};
......@@ -5232,7 +5391,7 @@ module OneM2M_Templates {
* @desc PrimitiveContent for CREATE operation for RemoteCSE resource with poa
* @param p_name Resource name
*/
template (value) RemoteCSE_optional m_contentCreateRemoteCSE_poa (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName, in PoaList p_poaList):= {
template (value) RemoteCSE_optional m_contentCreateRemoteCSE_poa (in template (omit) ResourceName p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_TS_CSE1.cseId & "/" & PX_TS_CSE1.cseName, in PoaList p_poaList):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -5243,8 +5402,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
cseType := omit,//O
pointOfAccess := p_poaList,//O
cSEBase := valueof(p_cSEBase),//M
......@@ -5262,6 +5424,7 @@ module OneM2M_Templates {
externalGroupID := omit,//O
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
choice := omit//O
};
......@@ -5279,8 +5442,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
cseType := *,//O
pointOfAccess := *,//O
cSEBase := ?,//M
......@@ -5298,6 +5464,7 @@ module OneM2M_Templates {
externalGroupID := *,//O
triggerEnable := *,//O
activityPatternElements := *,//O
enableTimeCompensation := *,//O
choice := *//O
};
......@@ -5317,6 +5484,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit,//OA O
location := omit,//O
cseType := omit,//OA O
pointOfAccess := omit,//OA O
cSEBase := omit,//OA O
......@@ -5350,6 +5518,7 @@ module OneM2M_Templates {
link := ?, //M
dynamicAuthorizationConsultationIDs := *,//OA O
stateTag := *,//OA M
location := *,//O
maxNrOfInstances := *,//OA O
maxByteSize := *, //OA O
maxInstanceAge := *, //OA O
......@@ -5372,9 +5541,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
locationSource := p_locationSource, //M
announceSyncType := omit,//O
locationSource := p_locationSource, //M
locationInformationType := omit,//O
locationUpdatePeriod := p_locationUpdatePeriod, //O
locationTargetID := p_locationTargetID, //O
......@@ -5402,8 +5573,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
locationSource := int1, //M
locationInformationType := omit,//O
locationUpdatePeriod := omit, //O
......@@ -5477,6 +5650,23 @@ module OneM2M_Templates {
trackingID1 := omit,
trackingID2 := omit
};
template (value) Notification m_contentNotificationEmpty := {
notificationEvent := omit,
verificationRequest := omit,
subscriptionDeletion := omit,
subscriptionReference := omit,
creator := omit,
notificationForwardingURI := omit,
notificationTarget := omit,
targetRemovalRequest := omit,
targetRemovalAllowance := omit,
iPEDiscoveryRequest := omit,
aERegistrationPointChange := omit,
aEReferenceIDChange := omit,
trackingID1 := omit,
trackingID2 := omit
};
/**
* @desc primitiveContent for CREATE operation for SemanticDescriptor resource, with specific OntologyRef
......@@ -5501,6 +5691,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,
choice := omit //NP
};
......@@ -5520,7 +5711,8 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
creator := omit, //O
custodian := omit,//O
creator := omit, //O
eventID := omit, //NP
eventType := omit, //M
eventStart := omit, //O
......@@ -5547,6 +5739,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit, //O
eventID := omit, //NP
eventType := int3, //M TIMERBASED
......@@ -5573,6 +5766,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit, //O
eventID := omit, //NP
eventType := int2, //M STORAGEBASED
......@@ -5599,6 +5793,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit, //O
eventID := omit, //NP
eventType := int1, //M DATAOPERATION
......@@ -5628,6 +5823,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,
statsCollectID := omit,
collectingEntityID := omit, // //collect all Entities
......@@ -5654,6 +5850,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
status := omit, //NP default INACTIVE
......@@ -5663,8 +5860,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := 1, //O
maxNumNodes := 1, //O
currentNumNodes := omit,//O
maxNumNodes := 1, //O
maxNumBytes := 1, //O
maxNumUsers := 1, //O
maxRequestRate := 1, //O
maxNumContainers := 1, //O
maxNumInstancesPerContainer := 1, //O
......@@ -5674,7 +5873,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := 1, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
};
......@@ -5694,6 +5892,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
status := omit, //NP default INACTIVE
......@@ -5703,9 +5902,11 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := omit, //O
currentNumNodes := omit,//O
maxNumNodes := omit, //O
maxNumBytes := omit, //O
maxRequestRate := omit, //O
maxNumUsers := omit, //O
maxRequestRate := omit, //O
maxNumContainers := omit, //O
maxNumInstancesPerContainer := omit, //O
maxNumTimeSeries := omit, //O
......@@ -5714,7 +5915,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
};
......@@ -5734,6 +5934,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
status := omit, //NP
......@@ -5743,8 +5944,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := 2, //O
currentNumNodes := omit,//O
maxNumNodes := 2, //O
maxNumBytes := 2, //O
maxNumUsers := 2, //O
maxRequestRate := 2, //O
maxNumContainers := 2, //O
maxNumInstancesPerContainer := 2, //O
......@@ -5754,7 +5957,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := 2, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
};
......@@ -5774,6 +5976,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
status := omit, //NP
......@@ -5783,8 +5986,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := omit, //O
currentNumNodes := omit,//O
maxNumNodes := omit, //O
maxNumBytes := 200, //O
maxNumUsers := omit, //O
maxRequestRate := omit, //O
maxNumContainers := omit, //O
maxNumInstancesPerContainer := omit, //O
......@@ -5794,7 +5999,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
};
......@@ -5814,6 +6018,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
status := omit, //NP
......@@ -5823,8 +6028,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := omit, //O
currentNumNodes := omit,//O
maxNumNodes := omit, //O
maxNumBytes := 100, //O
maxNumUsers := omit, //O
maxRequestRate := omit, //O
maxNumContainers := omit, //O
maxNumInstancesPerContainer := omit, //O
......@@ -5834,7 +6041,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
};
......@@ -5854,6 +6060,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
applicableCredIDs := omit,
allowedApp_IDs := omit,
allowedAEs := omit,
......@@ -5873,6 +6080,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
nodeID := omit, //M
cSE_ID := omit, //O
deviceIdentifier := omit, //M
......@@ -5892,6 +6100,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
nodeID := p_nodeID, //M
cSE_ID := p_cseId, //O
deviceIdentifier := omit, //M
......@@ -5915,7 +6124,8 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
M2M_User_ID := PX_M2M_USER_ID, // M
custodian := omit,//O
m2M_User_ID := PX_M2M_USER_ID, // M
maxNumAEs := 1, // O
maxNumNodes := 1, // O
maxNumBytes := 1, // O
......@@ -5928,7 +6138,8 @@ module OneM2M_Templates {
maxNotificationRate := 1, // O
maxNumFlexContainers := 1, // O
maxNumInstancesPerFlexContainer := 1, // O
defaultAccessControlPrivileges := omit // O
defaultAccessControlPrivileges := omit, // O
choice := omit //O
};
/**
......@@ -5947,7 +6158,8 @@ module OneM2M_Templates {
maxMembersPerGroup := 2, // O
maxNotificationRate := 2, // O
maxNumFlexContainers := 2, // O
maxNumInstancesPerFlexContainer := 2 // O
maxNumInstancesPerFlexContainer := 2, // O
choice := omit //O
};
......@@ -5955,7 +6167,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for timeSeries resource
* @param p_name Resource name
*/
template (value) TimeSeries_optional m_contentCreateTimeSeries (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
template (value) TimeSeries_optional m_contentCreateTimeSeries (in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -5966,15 +6178,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
currentNrOfInstances := omit,//NP
currentByteSize := omit,//NP
periodicInterval := omit,//O
periodicIntervalDelta := omit,//O
missingDataDetect := omit,//O
missingDataMaxNr := omit,//O
missingDataList := omit,//NP
......@@ -5989,7 +6205,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for timeSeries resource
* @param p_name Resource name
*/
template TimeSeries_optional mw_contentCreateTimeSeriesBase (template XSD.String p_name := *):= {
template TimeSeries_optional mw_contentCreateTimeSeriesBase (template ResourceName p_name := *):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6000,15 +6216,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
creator := *,//O
location := *,//O
maxNrOfInstances := *,//O
maxByteSize := *,//O
maxInstanceAge := *,//O
currentNrOfInstances := omit,//NP
currentByteSize := omit,//NP
periodicInterval := *,//O
periodicIntervalDelta := *,//O
missingDataDetect := *,//O
missingDataMaxNr := *,//O
missingDataList := omit,//NP
......@@ -6035,12 +6255,14 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit, //O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
currentNrOfInstances := omit,//NP
currentByteSize := omit,//NP
periodicInterval := omit,//O
periodicIntervalDelta := omit,//O
missingDataMaxNr := omit,//O
missingDataList := omit,//NP
missingDataCurrentNr := omit,//NP
......@@ -6066,12 +6288,14 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?, //M NA
dynamicAuthorizationConsultationIDs := *, //OA
location := *,//O
maxNrOfInstances := *,//O OA
maxByteSize := *,//O OA
maxInstanceAge := *,//O OA
currentNrOfInstances := *,//M OA
currentByteSize := *,//M OA
periodicInterval := *,//O OA
periodicIntervalDelta := *,//O
missingDataMaxNr := *,//O OA
missingDataList := *,//O OA
missingDataCurrentNr := *,//O OA
......@@ -6106,7 +6330,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for timeSeries resource
* @param p_name Resource name
*/
template (value) TimeSeries_optional m_contentCreateTimeSeriesAttributes (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName,
template (value) TimeSeries_optional m_contentCreateTimeSeriesAttributes (in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName,
in template (omit) XSD.Boolean p_missingDataDetect := omit,
in template (omit) XSD.NonNegativeInteger p_periodicInterval := omit,
in template (omit) XSD.NonNegativeInteger p_missingDataMaxNr := omit,
......@@ -6122,7 +6346,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for invalid CREATE operation for timeSeries resource (using Container_update_invalid)
* @param p_name Resource name
*/
template (value) TimeSeries_invalid m_contentCreateTimeSeriesInvalid (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
template (value) TimeSeries_invalid m_contentCreateTimeSeriesInvalid (in template (omit) ResourceName p_name := c_defaultTimeSeriesResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6134,16 +6358,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
announceSyncType := omit,//O
creator := omit,//O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
currentNrOfInstances := omit,//NP
currentByteSize := omit,//NP
periodicInterval := omit,//O
periodicIntervalDelta := omit,//O
missingDataDetect := omit,//O
missingDataMaxNr := omit,//O
missingDataList := omit,//NP
......@@ -6158,7 +6385,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for Container resource
* @param p_name Resource name
*/
template (value) TimeSeriesInstance_optional m_contentCreateTimeSeriesInstance (in template (omit) XSD.String p_name := c_defaultTimeSeriesInstanceResourceName):= {
template (value) TimeSeriesInstance_optional m_contentCreateTimeSeriesInstance (in template (omit) ResourceName p_name := c_defaultTimeSeriesInstanceResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6169,6 +6396,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
dataGenerationTime := {alt_ := "00000101T000000"},//M
content := "AnyValue",//M
sequenceNr := omit,//O
......@@ -6180,7 +6408,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for TimeSeriesInstance resource
* @param p_name Resource name
*/
template TimeSeriesInstance_optional mw_contentCreateTimeSeriesInstanceBase (template XSD.String p_name := *):= {
template TimeSeriesInstance_optional mw_contentCreateTimeSeriesInstanceBase (template ResourceName p_name := *):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6191,6 +6419,7 @@ module OneM2M_Templates {
expirationTime := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
dataGenerationTime := ?,//M
content := ?,//M
sequenceNr := *,//O
......@@ -6228,7 +6457,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for Role resource
* @param p_name Resource name
*/
template (value) Role_optional m_contentCreateRole (in template (omit) XSD.String p_name := c_defaultRoleResourceName):= {
template (value) Role_optional m_contentCreateRole (in template (omit) ResourceName p_name := c_defaultRoleResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6239,6 +6468,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
roleID := "roleID@a.b", //M
issuer := "issuer", //M
holder := "holder", //M
......@@ -6253,7 +6483,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for Role resource
* @param p_name Resource name
*/
template Role_optional mw_contentCreateRoleBase (template XSD.String p_name := *):= {
template Role_optional mw_contentCreateRoleBase (template ResourceName p_name := *):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6264,6 +6494,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
roleID := ?, //M
issuer := ?, //M
holder := ?, //M
......@@ -6278,7 +6509,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for Token resource
* @param p_name Resource name
*/
template (value) Token_optional m_contentCreateToken (in template (omit) XSD.String p_name := c_defaultRoleResourceName):= {
template (value) Token_optional m_contentCreateToken (in template (omit) ResourceName p_name := c_defaultRoleResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6289,6 +6520,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
tokenID := "roleID@a.b", //M
tokenObject := {alt_ := "oneM2M.oneM2M.oneM2M"}, //M
version := omit, //O
......@@ -6307,7 +6539,7 @@ module OneM2M_Templates {
* @desc Base reception template primitiveContent for CREATE operation for Token resource
* @param p_name Resource name
*/
template Token_optional mw_contentCreateTokenBase (template XSD.String p_name := *):= {
template Token_optional mw_contentCreateTokenBase (template ResourceName p_name := *):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -6318,6 +6550,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
tokenID := ?, //M
tokenObject := ?, //M
version := omit, //O
......@@ -6347,8 +6580,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6374,8 +6609,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6403,8 +6640,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6435,8 +6674,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6471,8 +6712,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6500,8 +6743,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6535,8 +6780,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6567,8 +6814,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := omit,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6594,8 +6843,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6628,8 +6879,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6655,8 +6908,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6682,8 +6937,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6712,8 +6969,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6739,8 +6998,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6768,8 +7029,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6795,8 +7058,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6824,8 +7089,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6851,8 +7118,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6882,8 +7151,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6912,8 +7183,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6939,8 +7212,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6968,8 +7243,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := omit,//NP
creator := *,//O
containerDefinition := ?,//M
......@@ -6986,10 +7263,9 @@ module OneM2M_Templates {
* @param p_name Resource name
*/
template (value) CrossResourceSubscription_optional m_contentCreateCrossResourceSubscription (in template (value) ListOfURIs p_notificationURI,
in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
in template (omit) ResourceName p_name := c_defaultSubscriptionResourceName,
in template (omit) TimeWindowType p_timeWindowType := int1,
in template (value) AbsRelTimestamp p_timeWindowSize,
in template (value) XSD.ID p_creator) := {
in template (value) XSD.Duration p_timeWindowSize) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -7000,9 +7276,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//NP
dynamicAuthorizationConsultationIDs := omit,//O
creator := p_creator,//M
custodian := omit,//O
creator := omit,//O
regularResourcesAsTarget := omit,//O
subscriptionResourcesAsTarget := omit,//O
regularResourcesAsTargetSubscriptions := omit, //NP
timeWindowType := p_timeWindowType,//M
timeWindowSize := p_timeWindowSize,//M
eventNotificationCriteriaSet := omit,//O
......@@ -7010,6 +7288,8 @@ module OneM2M_Templates {
expirationCounter := omit,//O
notificationURI := p_notificationURI,//M
subscriberURI := omit,//O
notificationStatsEnable := omit,//O
notificationStatsInfo := omit,//O
choice := omit//NP
};
......@@ -7031,8 +7311,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
appName := omit,//O
app_ID := omit,//NP
aE_ID := omit,//NP
......@@ -7049,6 +7332,7 @@ module OneM2M_Templates {
sessionCapabilities := omit, //O
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
choice := omit //NP
};
......@@ -7080,6 +7364,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
privileges := omit,//O
selfPrivileges := omit,//O
authorizationDecisionResourceIDs := omit,//O
......@@ -7088,6 +7373,38 @@ module OneM2M_Templates {
choice := omit //NP
};
/**
* @desc Base primitiveContent for UPDATE operation for CrossResourceSubscription resource
*/
template (value) CrossResourceSubscription_optional m_contentUpdateCrossResourceSubscription := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,//NP
regularResourcesAsTarget := omit, //NP
subscriptionResourcesAsTarget := omit, //NP
regularResourcesAsTargetSubscriptions := omit,//NP
timeWindowType := omit, //O
timeWindowSize := omit, //O
eventNotificationCriteriaSet := omit, //NP
notificationEventCat := omit, //O
expirationCounter := omit, //O
notificationURI := omit, //O
subscriberURI := omit, //NP
notificationStatsEnable := omit, //O
notificationStatsInfo := omit, //NP
choice := omit//NP
};
template (value) AccessControlPolicy_optional m_contentUpdateAcpPrivileges(in template(omit) SetOfAcrs p_privileges, in template(omit) SetOfAcrs p_selfPrivileges) modifies m_contentUpdateAcp := {
privileges := p_privileges,//O
selfPrivileges := p_selfPrivileges//O
......@@ -7162,8 +7479,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//NP
memberType := omit,//NP
specializationType := omit,//NP
......@@ -7176,6 +7495,8 @@ module OneM2M_Templates {
groupName := omit,//O
semanticSupportIndicator := omit,//O
notifyAggregation := omit,//O
somecastEnable := omit,//O
somecastAlgorithm := omit,//O
choice := omit//NP
};
......@@ -7198,9 +7519,11 @@ module OneM2M_Templates {
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
location := omit,//O
contentSerialization := omit,
e2eSecInfo := omit,
supportedReleaseVersions := omit,
currentTime := omit,
choice := omit
};
......@@ -7217,6 +7540,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit
};
......@@ -7234,8 +7558,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
scheduleElement := omit,//O
networkCoordinated := omit,//O
choice := omit//NP
......@@ -7255,6 +7581,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,//NP
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -7271,6 +7598,9 @@ module OneM2M_Templates {
notificationEventCat := omit,//O
subscriberURI := omit,//NP
associatedCrossResourceSub := omit,//O
notificationStatsEnable := omit,//O
notificationStatsInfo := omit,//O
primitiveProfileID := omit,//O
choice := omit//NP
};
......@@ -7288,8 +7618,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//NP
location := omit, //O
......@@ -7326,6 +7658,7 @@ module OneM2M_Templates {
expirationTime := omit,
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
stateTag := omit,
creator := omit,
contentInfo := omit,
......@@ -7333,6 +7666,7 @@ module OneM2M_Templates {
contentRef := omit,
ontologyRef := omit,
content := omit,
deletionCnt := omit,
choice := omit
};
......@@ -7347,9 +7681,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
locationSource := omit,//NP
announceSyncType := omit,//O
locationSource := omit,//NP
locationInformationType := omit,//O
locationUpdatePeriod := {p_locationUpdatePeriod}, //O
locationTargetID := omit, //NP
......@@ -7376,9 +7712,12 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
nodeID := omit,//O
nodeType := omit,//O
hostedCSELink := omit,//NP
hostedAELinks := omit,//O
hostedServiceLinks := omit,//O
......@@ -7399,8 +7738,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
cseType := omit,//NP
pointOfAccess := omit,//O
cSEBase := omit,//NP
......@@ -7418,46 +7760,53 @@ module OneM2M_Templates {
externalGroupID := omit,//O
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
choice := omit
}
template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfile := {
template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfile := {
resourceName := omit, //O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
accessControlPolicyIDs := omit,//O
creationTime := omit,//NP
expirationTime := omit,//O
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
creator := omit,//O
IDList := omit,//M
announceSyncType := omit,//O
iDList := omit,//M
resourceTypes := omit,//O
operations := omit,//O
resourceIDs := omit,//O
releaseVersions := omit,//O
additions := omit,//O
deletions := omit,//O
modifications := omit,//O
applicability := omit,//O
choice := omit//NP
}
template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
additions := {{"maxByteSize", "100"}}, //O
template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"maxByteSize", "100"}}}, //O
deletions := {"maxByteSize"} //O
}
template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"invalidAttributeAdd", "3"}}}, //O
deletions := {"invalidAttributedDelete"} //O
}
template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
additions := {{"releaseVersionIndicator", "3"}} //O
template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"releaseVersionIndicator", "3"}}} //O
}
template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
additions := {{"maxByteSize", "-10"}}
template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"maxByteSize", "-10"}}}
}
template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
......@@ -7472,6 +7821,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
location := omit,//O
appName := omit,
app_ID := omit,
aE_ID := omit,
......@@ -7503,6 +7853,7 @@ module OneM2M_Templates {
link := omit,
dynamicAuthorizationConsultationIDs := omit,
stateTag := omit,
location := omit,//O
maxNrOfInstances := omit,
maxByteSize := omit,
maxInstanceAge := omit,
......@@ -7537,7 +7888,9 @@ module OneM2M_Templates {
groupName := omit,
semanticSupportIndicator := omit,
notifyAggregation := omit,
choice := omit
somecastEnable := omit,
somecastAlgorithm := omit,
choice := omit
};
......@@ -7555,8 +7908,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
creator := omit, //O
descriptorRepresentation := omit, //M
semanticOpExec := omit, //NP
......@@ -7582,15 +7937,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
currentNrOfInstances := omit,//NP
currentByteSize := omit,//NP
periodicInterval := omit,//O
periodicIntervalDelta := omit,//O
missingDataDetect := omit,//O
missingDataMaxNr := omit,//O
missingDataList := omit,//NP
......@@ -7615,6 +7974,7 @@ module OneM2M_Templates {
expirationTime := omit,
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
dataGenerationTime := omit,
content := omit,
sequenceNr := omit,
......@@ -7636,6 +7996,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
custodian := omit,//O
roleID := omit,
issuer := omit,
holder := omit,
......@@ -7659,14 +8020,18 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit,//O
creator := omit, //O
memberFilter := omit, //M
smiID := omit, //O
inputDescriptor := omit, //O
outputDescriptor := omit, //O
functionDescriptor := omit //O
functionDescriptor := omit, //O
choice := omit
}
/**
......@@ -7683,15 +8048,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit,//O
creator := omit, //O
smjpID := omit, //O
smjpInputParameter := omit, //O
memberStoreType := omit, //O
mashupMember := omit, //O
resultGenType := omit, //O
periodForResultGen := omit //O
periodForResultGen := omit, //O
choice := omit
}
/**
......@@ -7710,7 +8079,8 @@ module OneM2M_Templates {
maxMembersPerGroup := 1, // O
maxNotificationRate := 1, // O
maxNumFlexContainers := 1, // O
maxNumInstancesPerFlexContainer := 1 // O
maxNumInstancesPerFlexContainer := 1, // O
choice := omit
};
/**
......@@ -7729,7 +8099,8 @@ module OneM2M_Templates {
maxMembersPerGroup := 2, // O
maxNotificationRate := 2, // O
maxNumFlexContainers := 2, // O
maxNumInstancesPerFlexContainer := 2 // O
maxNumInstancesPerFlexContainer := 2, // O
choice := omit
};
/**
......@@ -7744,31 +8115,32 @@ module OneM2M_Templates {
* @desc Base primitiveContent for UPDATE operation for SoftwareCampaign resource
*/
template (value) SoftwareCampaign_optional m_contentUpdateSoftwareCampaign := {
resourceName := omit,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
holder := omit,//O
announceTo := omit,//O
announceSyncType := omit,//O
announcedAttribute := omit,//O
campaignEnabled := omit,//O
campaignStatus := omit,//NP
version := omit,//O
softwareName := omit,//O
uRL := omit, //O
softwareTargets := omit,//O
softwareTriggerCriteria := omit,//O
softwareOperation := omit,//O
softwareLinks := omit,//NP
aggregatedSoftwareStatus := omit,//NP
individualSoftwareStatus := omit//NP
resourceName := omit,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
campaignEnabled := omit,//O
campaignStatus := omit,//NP
version := omit,//O
softwareName := omit,//O
uRL := omit, //O
softwareTargets := omit,//O
softwareTriggerCriteria := omit,//O
softwareOperation := omit,//O
softwareLinks := omit,//NP
aggregatedSoftwareStatus := omit,//NP
individualSoftwareStatuses := omit,//NP
choice := omit
};
template (value) TransactionMgmt_optional m_contentUpdateTransactionMgmt := {
resourceName := omit, //NP
......@@ -7781,6 +8153,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //NP
expirationTime := omit, //NP
dynamicAuthorizationConsultationIDs := omit, //NP
custodian := omit,//O
creator := omit, //NP
transactionLockTime := omit, //NP
transactionExecuteTime := omit, //NP
......@@ -7816,6 +8189,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //NP
expirationTime := omit, //NP
dynamicAuthorizationConsultationIDs := omit, //NP
custodian := omit,//O
creator := omit, //NP
transactionID := omit, //NP
transactionControl := omit, //NP
......@@ -7844,6 +8218,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := omit, //NP
m2M_SS_ID := omit, //O
status := omit, //NP
......@@ -7853,8 +8228,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := 2, //O
currentNumNodes := omit, //NP
maxNumNodes := 2, //O
maxNumBytes := 2, //O
maxNumUsers := omit, //O
maxRequestRate := 2, //O
maxNumContainers := 2, //O
maxNumInstancesPerContainer := 2, //O
......@@ -7864,7 +8241,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
......@@ -7888,6 +8264,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
applicableCredIDs := omit,//O
allowedApp_IDs := {"*"},//O
allowedAEs := omit,//O
......@@ -7914,6 +8291,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
nodeID := omit, //NP
cSE_ID := omit, //NP
deviceIdentifier := omit, //NP
......@@ -7938,6 +8316,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := omit, //NP
m2M_SS_ID := omit, //O
status := omit, //NP
......@@ -7947,8 +8326,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := omit, //O
currentNumAEs := omit, //NP
maxNumAEs := omit, //O
currentNumNodes := omit, //NP
maxNumNodes := omit, //O
maxNumBytes := omit, //O
maxNumUsers := omit, //O
maxRequestRate := omit, //O
maxNumContainers := omit, //O
maxNumInstancesPerContainer := omit, //O
......@@ -7958,7 +8339,6 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
......@@ -8177,6 +8557,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit//NP
};
}
......@@ -8195,6 +8576,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit//NP
};
......@@ -8213,8 +8595,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := omit,//O
location := omit,//O
appName := *,//O
app_ID := ?,//M
aE_ID := ?,//M
......@@ -8231,6 +8616,7 @@ module OneM2M_Templates {
sessionCapabilities := *, //O
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
choice := *//O
};
......@@ -8245,8 +8631,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
appName := omit,//O
app_ID := omit,//M
aE_ID := omit,//M
......@@ -8263,6 +8652,7 @@ module OneM2M_Templates {
sessionCapabilities := omit,//O
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
choice := omit//O
};
......@@ -8277,8 +8667,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
appName := *,//O
app_ID := *,//M
aE_ID := *,//M
......@@ -8295,6 +8688,7 @@ module OneM2M_Templates {
sessionCapabilities := *, //O
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
choice := *//O
};
......@@ -8310,6 +8704,7 @@ module OneM2M_Templates {
expirationTime := ?,//M MA
link := ?,//M,
dynamicAuthorizationConsultationIDs := *, //O OA
location := omit,//O
appName := *,//O OA
app_ID := *,//M OA
aE_ID := *,//M OA
......@@ -8341,6 +8736,7 @@ module OneM2M_Templates {
expirationTime := *,//M
link := *,//M,
dynamicAuthorizationConsultationIDs := *, //O
location := *,//O
appName := *,//O
app_ID := *,//M
aE_ID := *,//M
......@@ -8370,6 +8766,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
privileges := ?,//M
selfPrivileges := ?,//M
authorizationDecisionResourceIDs := *,//O
......@@ -8389,6 +8786,7 @@ module OneM2M_Templates {
expirationTime := *,//M
announceTo := *,//O
announcedAttribute := *,//M
announceSyncType := *,//O
privileges := *,//M
selfPrivileges := *,//M
authorizationDecisionResourceIDs := *,//O
......@@ -8408,6 +8806,7 @@ module OneM2M_Templates {
expirationTime := omit,//M
announceTo := omit,//O
announcedAttribute := omit,//M
announceSyncType := omit,//O
privileges := omit,//M
selfPrivileges := omit,//M
authorizationDecisionResourceIDs := omit,//O
......@@ -8427,8 +8826,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
locationSource := omit,//M
locationInformationType := omit,//O
locationUpdatePeriod := omit,//O
......@@ -8494,7 +8895,7 @@ module OneM2M_Templates {
choice := *//O
};
template Group_optional mw_contentGroupBase := {
template Group_optional mw_contentGroupBase := {
resourceName := ?,//M
resourceType := ?,//M
resourceID := ?,//M
......@@ -8505,8 +8906,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
creator := *,//O
memberType := ?,//M
specializationType := *,//O
......@@ -8519,6 +8922,8 @@ module OneM2M_Templates {
groupName := *,//O
semanticSupportIndicator := *,//O
notifyAggregation := *,//O
somecastEnable := *,//O
somecastAlgorithm := *,//O
choice := *//O
};
......@@ -8533,8 +8938,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//M
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//M
announceSyncType := *,//O
creator := *,//O
memberType := *,//M
specializationType := *,//O
......@@ -8547,6 +8954,8 @@ module OneM2M_Templates {
groupName := *,//O
semanticSupportIndicator := *,//O
notifyAggregation := *,//O
somecastEnable := *,//O
somecastAlgorithm := *,//O
choice := *//O
}
......@@ -8561,8 +8970,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
announceSyncType := omit,//O
creator := omit,//O
memberType := omit,//M
specializationType := omit,//O
......@@ -8575,6 +8986,8 @@ module OneM2M_Templates {
groupName := omit,//O
semanticSupportIndicator := omit,//O
notifyAggregation := omit,//O
somecastEnable := *,//O
somecastAlgorithm := *,//O
choice := omit//O
}
......@@ -8632,10 +9045,12 @@ module OneM2M_Templates {
groupName := *,//O
semanticSupportIndicator := *,//O
notifyAggregation := *,//O
somecastEnable := *,//O
somecastAlgorithm := *,//O
choice := *//O
};
template (value) MgmtCmd_optional m_contentMgmtCmd_allOmit := {
template MgmtCmd_optional m_contentMgmtCmd_allOmit := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -8646,6 +9061,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
description := omit,//O
cmdType := omit,//M
execReqArgs := omit,//O
......@@ -8667,6 +9083,7 @@ module OneM2M_Templates {
lastModifiedTime := ?,//M
labels := *,//O
expirationTime := ?,//M
requestAggregation := *,//O
choice := omit//NP
};
......@@ -8679,6 +9096,7 @@ module OneM2M_Templates {
lastModifiedTime := *,//M
labels := *,//O
expirationTime := *,//M
requestAggregation := *,//O
choice := omit//NP
};
......@@ -8691,6 +9109,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//M
labels := omit,//O
expirationTime := omit,//M
requestAggregation := omit,//O
choice := omit//NP
};
......@@ -8729,8 +9148,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
cseType := omit,//O
pointOfAccess := omit,//O
cSEBase := omit,//M
......@@ -8748,6 +9170,7 @@ module OneM2M_Templates {
externalGroupID := omit,//O
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
choice := omit//O
};
......@@ -8794,8 +9217,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
cseType := *,//O
pointOfAccess := *,//O
cSEBase := ?,//M
......@@ -8813,6 +9239,7 @@ module OneM2M_Templates {
externalGroupID := *,//O
triggerEnable := *,//O
activityPatternElements := *,//O
enableTimeCompensation := *,//O
choice := *//O
};
......@@ -8827,7 +9254,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
stateTag := ?,//M
custodian := *,//O
operation := ?,//M
target := ?,//M
originator := ?,//M
......@@ -8850,8 +9277,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
scheduleElement := ?,//M
networkCoordinated := ?,//M
choice := *//O
......@@ -8868,8 +9297,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//M
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//M
announceSyncType := *,//O
scheduleElement := *,//M
networkCoordinated := ?,//M
choice := *//O
......@@ -8886,8 +9317,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
announceSyncType := omit,//O
scheduleElement := omit,//M
networkCoordinated := omit,//M
choice := omit//O
......@@ -8935,6 +9368,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
creator := omit,//O
statsCollectID := omit,//M
collectingEntityID := omit,//M
......@@ -8967,15 +9401,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := p_expirationTime, //M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit, //O
announcedAttribute := omit, //O
announceSyncType := omit,//O
stateTag := omit,//O
creator := omit, //O
smjpID := p_smjpID, //M
smjpInputParameter := omit,//O
memberStoreType := p_memberStoreType, //M
mashupMember := omit, //O
resultGenType := p_resultGenType, //M
periodForResultGen := omit//O
periodForResultGen := omit,//O
choice := omit//M
};
template (value) StatsConfig_optional m_contentStatsConfig_allOmit := {
......@@ -8989,6 +9427,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
creator := omit,//O
choice := omit//M
}
......@@ -9004,6 +9443,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
......@@ -9020,6 +9460,9 @@ module OneM2M_Templates {
notificationEventCat := *,//O
subscriberURI := *,//O
associatedCrossResourceSub := *,//O
notificationStatsEnable := *,//O
notificationStatsInfo := *,//O
primitiveProfileID := *,//O
choice := *//O
};
template Subscription_optional mw_contentSubscription_any := {
......@@ -9033,6 +9476,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
......@@ -9049,6 +9493,9 @@ module OneM2M_Templates {
notificationEventCat := *,//O
subscriberURI := *,//O
associatedCrossResourceSub := *,//O
notificationStatsEnable := *,//O
notificationStatsInfo := *,//O
primitiveProfileID := *,//O
choice := *//O
}
......@@ -9063,6 +9510,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -9079,6 +9527,9 @@ module OneM2M_Templates {
notificationEventCat := omit,//O
subscriberURI := omit,//O
associatedCrossResourceSub := omit,//O
notificationStatsEnable := omit,//O
notificationStatsInfo := omit,//O
primitiveProfileID := omit,//O
choice := omit//O
}
......@@ -9128,6 +9579,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := ?,//M
creator := *,//O
contentInfo := *,//O
......@@ -9135,6 +9587,7 @@ module OneM2M_Templates {
contentRef := *, //O
ontologyRef := *,//O
content := ?,//M
deletionCnt := *,//O
choice := * //O
};
......@@ -9154,6 +9607,7 @@ module OneM2M_Templates {
expirationTime := omit,//M
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//M
creator := omit,//O
contentInfo := omit,//O
......@@ -9161,6 +9615,7 @@ module OneM2M_Templates {
contentRef := omit,
ontologyRef := omit,//O
content := omit, //M
deletionCnt := omit,//O
choice := omit
};
......@@ -9194,8 +9649,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := ?,//M
creator := *,//O
location := *,//O
......@@ -9225,8 +9682,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//M
announceSyncType := *,//O
stateTag := *,//M
creator := *,//M
location := *, //O
......@@ -9252,8 +9711,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
announceSyncType := omit,//O
stateTag := omit,//M
creator := omit,//M
location := omit, //O
......@@ -9280,6 +9741,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
source := omit,//M
target := omit,//M
lifespan := omit,//M
......@@ -9334,6 +9796,7 @@ module OneM2M_Templates {
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
stateTag := *,//O
location := *,//O
maxNrOfInstances := *,//O
maxByteSize := *,//O
maxInstanceAge := *,//O
......@@ -9388,7 +9851,7 @@ module OneM2M_Templates {
notificationEvent := *,//O
verificationRequest := *,//O
subscriptionDeletion := *,//O
subscriptionReference := *,//M //TODO Put it back to ? subscriptionReference is mandatory
subscriptionReference := ?,//M
creator := *,//O
notificationForwardingURI := *,//O
notificationTarget := *,
......@@ -9431,9 +9894,12 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
custodian := omit,//O
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
nodeID := omit,
nodeType := omit,//O
hostedCSELink := omit,
hostedAELinks := omit,//O
hostedServiceLinks := omit,//O
......@@ -9459,9 +9925,11 @@ module OneM2M_Templates {
pointOfAccess := ?,//M
nodeLink := *,//O
dynamicAuthorizationConsultationIDs := *,
location := *,//O
contentSerialization := *,
e2eSecInfo := *,//O
supportedReleaseVersions := ?,//M
currentTime := *,//O
choice := *//O
};
......@@ -9480,15 +9948,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
creator := omit,//M
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
currentNrOfInstances := omit,//M
currentByteSize := omit,//M
periodicInterval := omit,//O
periodicIntervalDelta := omit,//O
missingDataDetect := omit,//O
missingDataMaxNr := omit,//O
missingDataList := omit,//O
......@@ -9510,15 +9982,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
custodian := *,//O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
creator := *,//O TODO XSD should be changed to optional for creator in TimeSeries
location := *,//O
maxNrOfInstances := *,//O
maxByteSize := *,//O
maxInstanceAge := *,//O
currentNrOfInstances := ?,//M
currentByteSize := ?,//M
periodicInterval := *,//O
periodicIntervalDelta := *,//O
missingDataDetect := *,//O
missingDataMaxNr := *,//O
missingDataList := *,//O
......@@ -9578,12 +10054,14 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
location := *,//O
maxNrOfInstances := *,//O
maxByteSize := *,//O
maxInstanceAge := *,//O
currentNrOfInstances := *,//O
currentByteSize := *,//O
periodicInterval := *,//O
periodicIntervalDelta := *,//O
missingDataMaxNr := *,//O
missingDataList := *,//O
missingDataCurrentNr := *,//O
......@@ -9604,6 +10082,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
dataGenerationTime := ?,//M
content := ?,//M
sequenceNr := *,//O
......@@ -9639,6 +10118,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
roleID := omit, //M
issuer := omit, //M
holder := omit, //M
......@@ -9660,6 +10140,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
tokenID := omit, //M
tokenObject := omit, //M
version := omit, //O
......@@ -9686,12 +10167,20 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
custodian := omit,//O
location := omit,//O
containerDefinition := omit, //M
ontologyRef := omit, //O
contentSize := omit, //NP
nodeLink := omit //O
nodeLink := omit, //O
maxNrOfInstances := omit, //O
maxInstanceAge := omit, //O
maxByteSize := omit, //O
currentNrOfInstances := omit, //O
currentByteSize := omit //O
}
template (present) FlexContainerResource_optional mw_contentFlexContainer(
......@@ -9709,12 +10198,20 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
stateTag := *,//NP
creator := *,//O
custodian := *,//O
location := *,//O
containerDefinition := *, //M
ontologyRef := *, //O
contentSize := *, //NP
nodeLink := * //O
nodeLink := *, //O
maxNrOfInstances := *, //O
maxInstanceAge := *, //O
maxByteSize := *, //O
currentNrOfInstances := *, //O
currentByteSize := * //O
}
template DeviceAirConditioner_optional m_contentDeviceAirConditioner_allOmit := {
......@@ -9728,8 +10225,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9750,8 +10249,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9772,8 +10273,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9794,8 +10297,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9816,8 +10321,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9838,8 +10345,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9860,8 +10369,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9882,8 +10393,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9904,8 +10417,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9926,8 +10441,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9948,8 +10465,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9970,8 +10489,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -9992,8 +10513,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := omit, //M
......@@ -10014,9 +10537,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *,//O
creator := ?,//M
custodian := *,//O
creator := *,//O
regularResourcesAsTarget := *,//O
subscriptionResourcesAsTarget := *,//O
regularResourcesAsTargetSubscriptions := *,//O
timeWindowType := ?,//M
timeWindowSize := ?,//M
eventNotificationCriteriaSet := *,//O
......@@ -10024,6 +10549,8 @@ module OneM2M_Templates {
expirationCounter := *,//O
notificationURI := ?,//M
subscriberURI := *,//O
notificationStatsEnable := *,//O
notificationStatsInfo := *,//O
choice := *//O
};
......@@ -10038,9 +10565,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//NP
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
creator := omit,//M
regularResourcesAsTarget := omit,//O
subscriptionResourcesAsTarget := omit,//O
regularResourcesAsTargetSubscriptions := omit,//O
timeWindowType := omit,//M
timeWindowSize := omit,//M
eventNotificationCriteriaSet := omit,//O
......@@ -10048,6 +10577,8 @@ module OneM2M_Templates {
expirationCounter := omit,//O
notificationURI := omit,//M
subscriberURI := omit,//O
notificationStatsEnable := *,//O
notificationStatsInfo := *,//O
choice := omit//NP
}
......@@ -10063,6 +10594,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
m2M_Sub_ID := ?, //M
m2M_SS_ID := *, //O
status := ?, //M
......@@ -10072,8 +10604,10 @@ module OneM2M_Templates {
serviceSubscriptionDuration := *, //O
currentNumAEs := ?, //M
maxNumAEs := *, //O
currentNumNodes := ?, //M
maxNumNodes := *, //O
maxNumBytes := *, //O
maxNumUsers := *, //O
maxRequestRate := *, //O
maxNumContainers := *, //O
maxNumInstancesPerContainer := *, //O
......@@ -10083,7 +10617,6 @@ module OneM2M_Templates {
maxNotificationRate := *, //O
maxNumFlexContainers := *, //O
maxNumInstancesPerFlexContainer := *, //O
maxNumUsers := *, //O
defaultAccessControlPrivileges := *, //O
choice := * //O
......@@ -10099,6 +10632,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
applicableCredIDs := *,//O
allowedApp_IDs := *,//O
allowedAEs := *,//O
......@@ -10118,6 +10652,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
nodeID := ?,//M
cSE_ID := *,//O
deviceIdentifier := *,//O
......@@ -10135,7 +10670,7 @@ module OneM2M_Templates {
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
template (value) GenericInterworkingService_invalid m_contentCreateGenericInterworkingService_invalid (in template (omit) XSD.String p_name := c_defaultGenericInterworkingServiceResourceName,
template (value) GenericInterworkingService_invalid m_contentCreateGenericInterworkingService_invalid (in template (omit) ResourceName p_name := c_defaultGenericInterworkingServiceResourceName,
in template (omit) AcpType p_accessControlPolicyIds := omit) := {
resourceName := p_name,//O
......@@ -10175,8 +10710,11 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
appName := omit,//O
app_ID := omit,//M
aE_ID := omit,//M
......@@ -10185,7 +10723,15 @@ module OneM2M_Templates {
nodeLink := omit,//O
requestReachability := omit,//M
contentSerialization := omit,//O
e2eSecInfo:= omit, //O
e2eSecInfo := omit, //O
m2M_Ext_ID := omit,//O
supportedReleaseVersions := omit, //O
registrationStatus := omit, //O
trackRegistrationPoints := omit, //O
sessionCapabilities := omit, //O
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit, //O
choice := omit//O
};
......@@ -10218,10 +10764,13 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
announceSyncType := omit,//O
creator := omit,//O
memberType := omit,//M
specializationType := omit,//O
currentNrOfMembers := omit,//M
maxNrOfMembers := omit,//M
memberIDs := omit,//M
......@@ -10230,6 +10779,9 @@ module OneM2M_Templates {
consistencyStrategy := omit,//O
groupName := omit,//O
semanticSupportIndicator := omit,//O
notifyAggregation := omit,//O
somecastEnable := omit,//O
somecastAlgorithm := omit,//O
choice := omit//O
};
......@@ -10242,7 +10794,9 @@ module OneM2M_Templates {
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid attribute
labels := omit,//O
expirationTime := omit//M
expirationTime := omit,//M
requestAggregation := omit,//O
choice := omit//O
};
template (value) Schedule_invalid m_contentUpdateSchedule_invalid := {
......@@ -10268,11 +10822,12 @@ module OneM2M_Templates {
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
maxNrOfInstances := omit,//Invalid attribute
labels := omit,//O
maxNrOfInstances := omit,//Invalid attribute
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -10288,6 +10843,10 @@ module OneM2M_Templates {
notificationContentType := omit,//M
notificationEventCat := omit,//O
subscriberURI := omit,//O
associatedCrossResourceSub := omit,//O
notificationStatsEnable := omit,//O
notificationStatsInfo := omit,//O
primitiveProfileID := omit,//O
choice := omit//O
};
......@@ -10303,10 +10862,13 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
announceSyncType := omit,//O
stateTag := omit,//M
creator := omit,//M
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
......@@ -10330,16 +10892,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
announceSyncType := omit,//O
creator := omit,//O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
maxInstanceAge := omit,//O
currentNrOfInstances := omit,//NP
currentByteSize := omit,//NP
periodicInterval := omit,//O
periodicIntervalDelta := omit,//O
missingDataDetect := omit,//O
missingDataMaxNr := omit,//O
missingDataList := omit,//NP
......@@ -10374,7 +10939,8 @@ module OneM2M_Templates {
tokenRequestInformation := omit,
authorSignReqInfo := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
vendorInformation := omit,
m2mServiceUser := omit
};
/**
......@@ -10405,14 +10971,15 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
/**
* @desc Base Reception template for request primitive
*/
template RequestPrimitive mw_requestPrimitive(template XSD.ID p_from := *, template XSD.ID p_to := ?) := {
template RequestPrimitive mw_requestPrimitive(template XSD.ID p_from := *, template (present) XSD.AnyURI p_to := ?) := {
operation := ?,
to_ := p_to,
from_ := p_from,
......@@ -10437,10 +11004,12 @@ module OneM2M_Templates {
localTokenIDs := *,
tokenRequestIndicator := *,
groupRequestTargetMembers := *,
groupSomecastTargetNumber := *,
authorSignIndicator := *,
authorSigns := *,
authorRelIndicator := *,
semanticQueryIndicator := *,
ontologyMappingResources := *,
releaseVersionIndicator := ?,
vendorInformation := *,
primitiveProfileIdentifier := *,
......@@ -10462,7 +11031,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
......@@ -10481,7 +11051,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
template ResponsePrimitive mw_responsePrimitiveKO := {
......@@ -10499,7 +11070,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
template ResponsePrimitive mw_responsePollingResponse (template RequestPrimitive p_requestPrimitive := ?) := {
......@@ -10517,7 +11089,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
template ResponsePrimitive mw_responseDiscovery (template URIList p_uriList := ?) := {
......@@ -10535,7 +11108,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
template (value) ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
......@@ -10553,7 +11127,8 @@ module OneM2M_Templates {
tokenRequestInformation := omit,
authorSignReqInfo := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
vendorInformation := omit,
m2mServiceUser := omit
};
template ResponsePrimitive mw_responseNotify(ResponseStatusCode p_statusCode) := {
......@@ -10571,7 +11146,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
/**
......@@ -10589,12 +11165,13 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,
expirationTime := ?,
dynamicAuthorizationConsultationIDs := *,
announceTo := *,
announcedAttribute := *,
custodian := *,//O
stateTag := *,
creator := *,
smjpInputParameter := *,
mashupResultFormat := ?,
mashupResult := ?
mashupResult := ?,
choice := *//NP
}
/**
......@@ -10612,15 +11189,19 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,
expirationTime := ?,
dynamicAuthorizationConsultationIDs := *,
custodian := *,//O
announceTo := *,
announcedAttribute := *,
announceSyncType := *,//O
stateTag := *,
creator := *,
smjpID := ?,
smjpInputParameter := *,
memberStoreType := ?,
mashupMember := *,
resultGenType := ?,
periodForResultGen := *
periodForResultGen := *,
choice := *//NP
}
......@@ -10639,8 +11220,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,
expirationTime := ?,
dynamicAuthorizationConsultationIDs := *,
custodian := *,//O
announceTo := *,
announcedAttribute := *,
announceSyncType := *,//O
creator := *,
descriptorRepresentation := ?,
semanticOpExec := *,
......@@ -10668,14 +11251,18 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,
expirationTime := ?,
dynamicAuthorizationConsultationIDs := *,
custodian := *,//O
announceTo := *,
announcedAttribute := *,
announceSyncType := *,//O
stateTag := *,
creator := *,
memberFilter := ?,
smiID := *,
inputDescriptor := *,
outputDescriptor := ?,
functionDescriptor := ?
functionDescriptor := ?,
choice := *//NP
}
template ResponsePrimitive mw_responseNotifySecurityInfo(ResponseStatusCode p_statusCode, template SecurityInfo p_securityInfo) := {
......@@ -10693,7 +11280,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
};
group InfoPortTemplates {
......@@ -10734,10 +11322,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -10774,7 +11364,7 @@ module OneM2M_Templates {
requestPrimitive := {
requestIdentifier := testcasename() & "-m_utCreateSubscription",
resourceType := int23,
primitiveContent := {subscription := m_contentSubscription}
primitiveContent := {subscription := mw_contentSubscription_allOmit}
}
}
......@@ -10821,10 +11411,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -10876,10 +11468,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -10931,10 +11525,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -10966,7 +11562,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,//FIXME
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
}
......@@ -10985,7 +11582,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,//FIXME
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
}
......@@ -11004,7 +11602,8 @@ module OneM2M_Templates {
tokenRequestInformation := *,
authorSignReqInfo := *,
releaseVersionIndicator := ?,//FIXME
vendorInformation := *
vendorInformation := *,
m2mServiceUser := *
}
......@@ -11163,10 +11762,12 @@ module OneM2M_Templates {
localTokenIDs := omit,
tokenRequestIndicator := omit,
groupRequestTargetMembers := omit,
groupSomecastTargetNumber := omit,
authorSignIndicator := omit,
authorSigns := omit,
authorRelIndicator := omit,
semanticQueryIndicator := omit,
ontologyMappingResources := omit,
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit,
primitiveProfileIdentifier := omit,
......@@ -11665,7 +12266,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for CREATE operation for softwareCampaign resource
* @param p_name Resource name
*/
template (value) SoftwareCampaign_optional m_contentCreateSoftwareCampaign (in template (omit) XSD.String p_name := c_defaultRoleResourceName):= {
template (value) SoftwareCampaign_optional m_contentCreateSoftwareCampaign (in template (omit) ResourceName p_name := c_defaultRoleResourceName):= {
resourceName := omit,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -11676,10 +12277,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
holder := omit,//O
announceTo := omit,//O
announceSyncType := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
campaignEnabled := omit,//O
campaignStatus := omit,//NP
version := omit,//M
......@@ -11690,7 +12291,8 @@ module OneM2M_Templates {
softwareOperation := omit,//M
softwareLinks := omit,//NP
aggregatedSoftwareStatus := omit,//NP
individualSoftwareStatus := omit//NP
individualSoftwareStatuses := omit,//NP
choice := omit//NP
};
/**
......@@ -11707,10 +12309,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
holder := omit,//O
announceTo := omit,//O
announceSyncType := omit,//O
custodian := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
campaignEnabled := false,
campaignStatus := int2,
version := "version1", //
......@@ -11721,27 +12323,28 @@ module OneM2M_Templates {
softwareOperation := int1,
softwareLinks := omit,
aggregatedSoftwareStatus := int0,
individualSoftwareStatus := omit
individualSoftwareStatuses := omit,
choice := omit//NP
};
template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTargets(template Action_optional p_action := omit) modifies m_contentCreateSoftwareCampaignBase := {
template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTargets(template ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria := omit) modifies m_contentCreateSoftwareCampaignBase := {
resourceName := c_defaultSoftwareCampaignResourceName, //O
softwareTargets := {"InvalidTarget"},
softwareTriggerCriteria := p_action,
softwareTriggerCriteria := p_softwareTriggerCriteria,
softwareOperation := int1,
softwareLinks := omit,
aggregatedSoftwareStatus := int0,//UNINITIALIZED
individualSoftwareStatus := omit
individualSoftwareStatuses := omit
};
template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(in template ListOfM2MID p_softwareTargets := omit, template Action_optional p_action) modifies m_contentCreateSoftwareCampaignBase := {
template SoftwareCampaign_optional m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(in template ListOfM2MID p_softwareTargets := omit, template ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria) modifies m_contentCreateSoftwareCampaignBase := {
resourceName := c_defaultSoftwareCampaignResourceName, //O
softwareTargets := p_softwareTargets,
softwareTriggerCriteria := p_action,
softwareTriggerCriteria := p_softwareTriggerCriteria,
softwareOperation := int1,
softwareLinks := omit,
aggregatedSoftwareStatus := int0,//UNINITIALIZED
individualSoftwareStatus := omit
individualSoftwareStatuses := omit
};
/**
......@@ -11756,19 +12359,19 @@ module OneM2M_Templates {
/**
* @desc CREATE request primitive for Software campaign resource without attribute softwareTargets
*/
template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTargets(in template (value) Action_optional p_action) modifies m_create := {
template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTargets(in template (value) ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria) modifies m_create := {
requestIdentifier := testcasename() & "-m_createSoftwareCampaign",
resourceType := int61,
primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTargets(p_action)}
primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTargets(p_softwareTriggerCriteria)}
};
/**
* @desc CREATE request primitive for Software campaign resource without attribute SoftwareTriggerCriteria
*/
template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTriggerCriteria(in template (omit) ListOfM2MID p_softwareTargets := omit, template (value) Action_optional p_action) modifies m_create := {
template (value) RequestPrimitive m_createSoftwareCampaignNoSoftwareTriggerCriteria(in template (omit) ListOfM2MID p_softwareTargets := omit, template (value) ListOfSoftwareTriggerCriteria p_softwareTriggerCriteria) modifies m_create := {
requestIdentifier := testcasename() & "-m_createSoftwareCampaign",
resourceType := int61,
primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(p_softwareTargets, p_action)}
primitiveContent := {softwareCampaign := m_contentCreateSoftwareCampaignNoSoftwareTriggerCriteria(p_softwareTargets, p_softwareTriggerCriteria)}
};
}
......
LibOneM2M/OneM2M_TypesAndValues.ttcn
View file @ 24aa5a3a
......@@ -263,7 +263,8 @@ group OptionalResourceTypes {
Labels labels optional,
Timestamp expirationTime optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
SetOfAcrs privileges optional,
SetOfAcrs selfPrivileges optional,
ListOfURIs authorizationDecisionResourceIDs optional,
......@@ -298,29 +299,29 @@ group OptionalResourceTypes {
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID holder optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
XSD.ID announceSyncType optional,
ListOfNCNames announcedAttribute optional,
XSD.ID creator optional,
XSD.Integer actionPriority optional,
XSD.AnyURI subjectResourceID optional,
EvalCriteria evalCriteria optional,
EvalMode evalMode optional,
XSD.Integer evalControlParam optional,
ListOfURIs dependencies optional,
XSD.AnyURI objectResourceID optional,
RequestPrimitive actionPrimitive optional,
ActionInput input optional,
ResponsePrimitive actionResult optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.PositiveInteger actionPriority optional,
XSD.AnyURI subjectResourceID optional,
EvalCriteria evalCriteria optional,
EvalMode evalMode optional,
XSD.PositiveInteger evalControlParam optional,
ListOfURIs dependencies optional,
XSD.AnyURI objectResourceID optional,
RequestPrimitive actionPrimitive optional,
ActionInput input optional,
ResponsePrimitive actionResult optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Dependency dependency,
Subscription subscription,
Transaction transaction
Transaction transaction
} choice_list
} choice optional
}
......@@ -334,7 +335,7 @@ group OptionalResourceTypes {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
};
type record AccessControlPolicyAnnc_optional
{
......@@ -383,8 +384,11 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
......@@ -401,6 +405,7 @@ group OptionalResourceTypes {
SessionCapabilities sessionCapabilities optional,
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -418,9 +423,10 @@ group OptionalResourceTypes {
TriggerRequest triggerRequest,
TransactionMgmt transactionMgmt,
Transaction transaction,
PrimitveProfile primitiveProfile,
State_optional state,
ProcessManagement_optional processManagement
E2eQosSession e2eQosSession,
TimeSyncBeacon timeSyncBeacon,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
......@@ -432,6 +438,13 @@ group OptionalResourceTypes {
variant (aE_ID) "name as 'AE-ID'";
//variant (requestReachability) "text 'true' as '1'";
//variant (requestReachability) "text 'false' as '0'";
variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'";
//variant (trackRegistrationPoints) "text 'true' as '1'";
//variant (trackRegistrationPoints) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -453,6 +466,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
......@@ -490,7 +504,10 @@ group OptionalResourceTypes {
CrossResourceSubscription crossResourceSubscription,
TriggerRequest triggerRequest,
TransactionMgmt transactionMgmt,
Transaction transaction
Transaction transaction,
E2eQosSession e2eQosSession,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
......@@ -501,6 +518,10 @@ group OptionalResourceTypes {
variant (aE_ID) "name as 'AE-ID'";
//variant (requestReachability) "text 'true' as '1'";
//variant (requestReachability) "text 'false' as '0'";
//variant (trackRegistrationPoints) "text 'true' as '1'";
//variant (trackRegistrationPoints) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -508,7 +529,7 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'";
};
type record MgmtCmd_optional
{
ResourceName resourceName optional,
......@@ -521,6 +542,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.String description optional,
CmdType cmdType optional,
ExecReqArgsListType execReqArgs optional,
......@@ -551,7 +573,7 @@ group OptionalResourceTypes {
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record MgmtResource_optional
{
......@@ -565,8 +587,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition optional,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
......@@ -617,12 +641,20 @@ group OptionalResourceTypes {
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.ID custodian optional,
GeoCoordinates location optional,
XSD.AnyURI containerDefinition optional,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional
XSD.AnyURI nodeLink optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger currentNrOfInstances optional,
XSD.NonNegativeInteger currentByteSize optional
}
with {
variant "name as uncapitalized";
......@@ -642,11 +674,18 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
GeoCoordinates location optional,
XSD.AnyURI containerDefinition optional,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger currentNrOfInstances optional,
XSD.NonNegativeInteger currentByteSize optional
}
with {
variant "name as uncapitalized";
......@@ -665,11 +704,13 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
GeoCoordinates location optional, //TODO Manually added until XSD files are updated
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
......@@ -693,7 +734,7 @@ group OptionalResourceTypes {
}
with {
variant "name as uncapitalized";
//variant "element";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (disableRetrieval) "text 'true' as '1'";
......@@ -719,6 +760,7 @@ group OptionalResourceTypes {
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.NonNegativeInteger stateTag optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
......@@ -770,13 +812,15 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
ContentRef contentRef optional,
XSD.AnyURI ontologyRef optional,
XSD.AnySimpleType content optional,
XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
XSD.PositiveInteger deletionCnt optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -812,7 +856,7 @@ group OptionalResourceTypes {
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional,
XSD.AnySimpleType content optional,
XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -848,9 +892,11 @@ group OptionalResourceTypes {
PoaList pointOfAccess optional,
XSD.AnyURI nodeLink optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
GeoCoordinates location optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions optional,
Timestamp currentTime optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -872,7 +918,7 @@ group OptionalResourceTypes {
M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
ServiceSubscribedAppRule serviceSubscribedAppRule,
Role role,
XSD.Token token,
OneM2M_Types.Token token,
Sg_flexContainerResource_group sg_flexContainerResource,
AuthorizationDecision_1 authorizationDecision,
AuthorizationPolicy authorizationPolicy,
......@@ -886,9 +932,11 @@ group OptionalResourceTypes {
BackgroundDataTransfer backgroundDataTransfer,
TransactionMgmt transactionMgmt,
Transaction transaction,
PrimitveProfile primitiveProfile,
State_optional state,
ProcessManagement_optional processManagement
SemanticRuleRepository semanticRuleRepository,
E2eQosSession e2eQosSession,
TimeSyncBeacon timeSyncBeacon,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
......@@ -904,6 +952,7 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].aE) "name as capitalized";
variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEContactList) "name as capitalized";
};
type record CSEBaseAnnc_optional
......@@ -915,68 +964,41 @@ group OptionalResourceTypes {
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
AcpType accessControlPolicyIDs optional,
CseTypeID cseType optional,
XSD.ID cSE_ID optional,
ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
PoaList pointOfAccess optional,
XSD.AnyURI nodeLink optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
RemoteCSE remoteCSE,
RemoteCSEAnnc remoteCSEAnnc,
Node node,
AE aE,
Container container,
Group group_,
AccessControlPolicy accessControlPolicy,
Subscription subscription,
MgmtCmd mgmtCmd,
LocationPolicy locationPolicy,
StatsConfig statsConfig,
StatsCollect statsCollect,
Request request,
Delivery delivery,
Schedule schedule,
M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
ServiceSubscribedAppRule serviceSubscribedAppRule,
Role role,
XSD.Token token,
Sg_flexContainerResource_group sg_flexContainerResource,
AuthorizationDecision_1 authorizationDecision,
AuthorizationPolicy authorizationPolicy,
AuthorizationInformation authorizationInformation,
OntologyRepository ontologyRepository,
SemanticMashupJobProfile semanticMashupJobProfile,
SemanticMashupInstance semanticMashupInstance,
AEContactList aEContactList,
LocalMulticastGroup localMulticastGroup,
CrossResourceSubscription crossResourceSubscription,
BackgroundDataTransfer backgroundDataTransfer,
TransactionMgmt transactionMgmt,
Transaction transaction
NodeAnnc nodeAnnc,
ContainerAnnc containerAnnc,
GroupAnnc groupAnnc,
AccessControlPolicyAnnc accessControlPolicyAnnc,
TimeSeriesAnnc timeSeriesAnnc,
LocationPolicyAnnc locationPolicyAnnc,
AEAnnc aEAnnc,
Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource,
OntologyRepositoryAnnc ontologyRepositoryAnnc,
SemanticMashupJobProfileAnnc semanticMashupJobProfileAnnc,
SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
TimeSyncBeaconAnnc timeSyncBeaconAnnc,
PrimitiveProfileAnnc primitiveProfileAnnc
} choice_list
} choice optional
}
with {
variant "element";
variant (resourceName) "attribute";
variant (cSE_ID) "name as 'CSE-ID'";
variant (supportedResourceType) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].aE) "name as capitalized";
variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEAnnc) "name as capitalized";
};
type record Delivery_optional
......@@ -991,6 +1013,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID source optional,
XSD.ID target optional,
Timestamp lifespan optional,
......@@ -1040,8 +1063,8 @@ group OptionalResourceTypes {
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
GenericInterworkingService genericInterworkingService,
GenericInterworkingOperationInstance genericInterworkingOperationInstance,
GenericInterworkingService_optional genericInterworkingService,
GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
SemanticDescriptor semanticDescriptor,
Subscription subscription
} choice_list
......@@ -1058,6 +1081,7 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
};
//TODO Update GenericInterworking resources
type record GenericInterworkingOperationInstance_optional
{
ResourceName resourceName optional,
......@@ -1114,20 +1138,24 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.ID creator optional,
MemberType memberType optional,
SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers optional,
XSD.PositiveInteger maxNrOfMembers optional,
record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty
record of XSD.AnyURI memberIDs optional,
ListOfURIs membersAccessControlPolicyIDs optional,
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
XSD.Boolean semanticSupportIndicator optional,
BatchNotify notifyAggregation optional,
XSD.Boolean somecastEnable optional,
SomecastAlgorithm somecastAlgorithm optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -1147,6 +1175,8 @@ group OptionalResourceTypes {
//variant (memberTypeValidated) "text 'false' as '0'";
//variant (semanticSupportIndicator) "text 'true' as '1'";
//variant (semanticSupportIndicator) "text 'false' as '0'";
//variant (somecastEnable) "text 'true' as '1'";
//variant (somecastEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1178,6 +1208,8 @@ group OptionalResourceTypes {
XSD.String groupName optional,
XSD.Boolean semanticSupportIndicator optional,
BatchNotify notifyAggregation optional,
XSD.Boolean somecastEnable optional,
SomecastAlgorithm somecastAlgorithm optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -1197,6 +1229,8 @@ group OptionalResourceTypes {
//variant (memberTypeValidated) "text 'false' as '0'";
//variant (semanticSupportIndicator) "text 'true' as '1'";
//variant (semanticSupportIndicator) "text 'false' as '0'";
//variant (somecastEnable) "text 'true' as '1'";
//variant (somecastEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1216,8 +1250,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
LocationSource locationSource optional,
LocationInformationType locationInformationType optional,
ListOfDuration locationUpdatePeriod optional,
......@@ -1244,6 +1280,8 @@ group OptionalResourceTypes {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (retrieveLastKnownLocation) "text 'true' as '1'";
//variant (retrieveLastKnownLocation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1288,6 +1326,13 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
//variant (retrieveLastKnownLocation) "text 'true' as '1'";
//variant (retrieveLastKnownLocation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record M2mServiceSubscriptionProfile_optional
......@@ -1302,18 +1347,20 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
//TODO To be removed/replaced by the type defined in XSDs
XSD.ID custodian optional,
XSD.ID m2M_Sub_ID optional,
XSD.ID m2M_SS_ID optional,
ServiceSubscriptionStatus status optional ,
XSD.ID m2M_SS_ID optional,
ServiceSubscriptionStatus status optional,
XSD.Boolean activate_ optional,
Timestamp activationTime optional,
Timestamp deactivationTime optional,
XSD.Duration serviceSubscriptionDuration optional,
XSD.NonNegativeInteger currentNumAEs optional,
XSD.NonNegativeInteger maxNumAEs optional,
XSD.NonNegativeInteger currentNumNodes optional,
XSD.NonNegativeInteger maxNumNodes optional,
XSD.NonNegativeInteger maxNumBytes optional,
XSD.NonNegativeInteger maxNumUsers optional,
XSD.NonNegativeInteger maxRequestRate optional,
XSD.NonNegativeInteger maxNumContainers optional,
XSD.NonNegativeInteger maxNumInstancesPerContainer optional,
......@@ -1323,7 +1370,6 @@ group OptionalResourceTypes {
XSD.NonNegativeInteger maxNotificationRate optional,
XSD.NonNegativeInteger maxNumFlexContainers optional,
XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
XSD.NonNegativeInteger maxNumUsers optional,
SetOfAcrs defaultAccessControlPrivileges optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
......@@ -1331,8 +1377,7 @@ group OptionalResourceTypes {
ServiceSubscribedNode serviceSubscribedNode,
Subscription subscription,
Transaction transaction,
//TODO To be removed/replaced by the type defined in XSDs
ServiceSubscribedUserProfile_optional serviceSubscribedUserProfile
ServiceSubscribedUserProfile serviceSubscribedUserProfile
} choice_list
} choice optional
}
......@@ -1340,6 +1385,11 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (m2M_Sub_ID) "name as 'M2M-Sub-ID'";
variant (m2M_SS_ID) "name as 'M2M-SS-ID'";
variant (activate_) "name as 'activate'";
//variant (activate_) "text 'true' as '1'";
//variant (activate_) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1359,9 +1409,12 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
NodeID nodeID optional,
NodeType nodeType optional,
XSD.ID hostedCSELink optional,
ListOfM2MID hostedAELinks optional,
ListOfM2MID hostedServiceLinks optional,
......@@ -1376,7 +1429,7 @@ group OptionalResourceTypes {
AreaNwkInfo areaNwkInfo,
AreaNwkDeviceInfo areaNwkDeviceInfo,
Firmware firmware,
//SoftwareCampaign_optional software,
Software software,
DeviceInfo deviceInfo,
DeviceCapability deviceCapability,
Reboot reboot,
......@@ -1395,6 +1448,8 @@ group OptionalResourceTypes {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (roamingStatus) "text 'true' as '1'";
//variant (roamingStatus) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1447,6 +1502,8 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
//variant (roamingStatus) "text 'true' as '1'";
//variant (roamingStatus) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1466,8 +1523,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
union {
......@@ -1475,7 +1534,9 @@ group OptionalResourceTypes {
record length(1 .. infinity) of union {
Subscription subscription,
Ontology ontology,
Transaction transaction
Transaction transaction,
OntologyMapping ontologyMapping,
OntologyMappingAlgorithmRepository ontologyMappingAlgorithmRepository
} choice_list
} choice optional
}
......@@ -1490,7 +1551,7 @@ group OptionalResourceTypes {
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record Ontology_optional
{
ResourceName resourceName optional,
......@@ -1503,12 +1564,15 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.String description optional,
SemanticFormat ontologyFormat optional,
XSD.AnySimpleType ontologyContent optional,//FIXME Use AnySimpleType instead
XSD.AnySimpleType ontologyContent optional,
Sparql semanticOpExec optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
......@@ -1540,6 +1604,7 @@ group OptionalResourceTypes {
Timestamp lastModifiedTime optional,
Labels labels optional,
Timestamp expirationTime optional,
XSD.Boolean requestAggregation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -1551,31 +1616,36 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record PrimitveProfile_optional
type record PrimitiveProfile_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
AcpType accessControlPolicyIDs optional,
Timestamp creationTime optional,
Timestamp expirationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID creator optional,
ListOfM2MID IDList optional,
AnnounceSyncType announceSyncType optional,
ListOfM2MID iDList optional,
ResourceTypeList resourceTypes optional,
ListOfOperations operations optional,
ListOfURIs resourceIDs optional,
SupportedReleaseVersions releaseVersions optional,
ListOfAttributes additions optional,
AttributeList deletions optional,
ListOfAttributes modifications optional,
AttributeList_1 deletions optional,
PrimitiveProfileApplicability applicability optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
......@@ -1589,142 +1659,141 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
variant (iDList) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record length(1 .. infinity) of EvalCriteria ListOfEvalCriteria_optional
with {
variant "name as uncapitalized";
variant "list";
};
type record StateTransitions_optional
{
EvalCriteria evalCriteria,
XSD.AnyURI nextState
}
type record length(1 .. infinity) of StateTransitions_optional ListOfStateTransitions_optional
with {
variant "name as uncapitalized";
variant "list";
};
type record Dependency_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID holder optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
XSD.ID announceSyncType optional,
XSD.ID creator optional,
XSD.Boolean sufficient optional,
EvalCriteria evalCriteria optional,
XSD.AnyURI referencedResourceID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.Boolean sufficient optional,
EvalCriteria evalCriteria optional,
XSD.AnyURI referencedResourceID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (sufficient) "text 'true' as '1'";
//variant (sufficient) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record State_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID holder optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
XSD.ID announceSyncType optional,
XSD.ID creator optional,
XSD.Boolean stateActive optional,
XSD.AnyURI stateAction optional,
ListOfStateTransitions_optional stateTransitions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction,
Action_optional action_ //to make tools compile
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.Boolean stateActive optional,
XSD.AnyURI stateAction optional,
ListOfStateTransitions stateTransitions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction,
Action action_
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (stateActive) "text 'true' as '1'";
//variant (stateActive) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
};
type record ProcessManagement_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
AcpType accessControlPolicyIDs optional,
Timestamp creationTime optional,
Timestamp expirationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID creator optional,
XSD.ID holder optional,
XSD.ID announceSyncType optional,
ProcessStatus processStatus optional,
ProcessControl processControl optional,
XSD.AnyURI currentState optional,
ListOfEvalCriteria_optional activateConditions optional,
ListOfEvalCriteria_optional endConditions optional,
XSD.AnyURI initialState optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction,
State_optional state
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
};
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
ProcessStatus processStatus optional,
ProcessControl processControl optional,
XSD.AnyURI currentState optional,
ListOfEvalCriteria activateConditions optional,
ListOfEvalCriteria endConditions optional,
XSD.AnyURI initialState optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction,
State_optional state
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record RemoteCSE_optional
{
......@@ -1738,8 +1807,11 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
XSD.AnyURI cSEBase optional,
......@@ -1757,6 +1829,7 @@ group OptionalResourceTypes {
ExternalID externalGroupID optional,
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -1783,9 +1856,12 @@ group OptionalResourceTypes {
CrossResourceSubscription crossResourceSubscription,
TransactionMgmt transactionMgmt,
Transaction transaction,
PrimitveProfile primitiveProfile,
State_optional state,
ProcessManagement_optional processManagement
E2eQosSession e2eQosSession,
TimeSyncBeacon timeSyncBeacon,
TimeSyncBeaconAnnc timeSyncBeaconAnnc,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile,
PrimitiveProfileAnnc primitiveProfileAnnc
} choice_list
} choice optional
}
......@@ -1800,6 +1876,10 @@ group OptionalResourceTypes {
variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
//variant (requestReachability) "text 'true' as '1'";
//variant (requestReachability) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1822,6 +1902,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
XSD.AnyURI cSEBase optional,
......@@ -1861,7 +1942,11 @@ group OptionalResourceTypes {
SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
CrossResourceSubscription crossResourceSubscription,
TransactionMgmt transactionMgmt,
Transaction transaction
Transaction transaction,
E2eQosSession e2eQosSession,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile,
PrimitiveProfileAnnc primitiveProfileAnnc
} choice_list
} choice optional
}
......@@ -1873,6 +1958,8 @@ group OptionalResourceTypes {
variant (cSE_ID) "name as 'CSE-ID'";
//variant (requestReachability) "text 'true' as '1'";
//variant (requestReachability) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1881,7 +1968,7 @@ group OptionalResourceTypes {
variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEAnnc) "name as capitalized";
};
type record Request_optional
{
ResourceName resourceName optional,
......@@ -1894,7 +1981,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID custodian optional,
Operation operation optional,
XSD.AnyURI target optional,
XSD.ID originator optional,
......@@ -1933,8 +2020,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
ScheduleEntries scheduleElement optional,
XSD.Boolean networkCoordinated optional,
union {
......@@ -1950,6 +2039,8 @@ group OptionalResourceTypes {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (networkCoordinated) "text 'true' as '1'";
//variant (networkCoordinated) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -1968,8 +2059,8 @@ group OptionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ScheduleEntries scheduleElement optional,
XSD.Boolean networkCoordinated optional,
union {
......@@ -1983,6 +2074,13 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
//variant (networkCoordinated) "text 'true' as '1'";
//variant (networkCoordinated) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record SemanticDescriptor_optional
......@@ -1997,8 +2095,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.ID creator optional,
SemanticFormat descriptorRepresentation optional,
Sparql semanticOpExec optional,
......@@ -2020,13 +2120,17 @@ group OptionalResourceTypes {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (semanticValidated) "text 'true' as '1'";
//variant (semanticValidated) "text 'false' as '0'";
//variant (validationEnable) "text 'true' as '1'";
//variant (validationEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record SemanticDescriptorAnnc_optional
{
ResourceName resourceName optional,
......@@ -2059,6 +2163,10 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
//variant (semanticValidated) "text 'true' as '1'";
//variant (semanticValidated) "text 'false' as '0'";
//variant (validationEnable) "text 'true' as '1'";
//variant (validationEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -2078,18 +2186,37 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
Sparql memberFilter optional,
ListOfURIs smiID optional,
XSD.Base64Binary inputDescriptor optional,
XSD.Base64Binary outputDescriptor optional,
XSD.Base64Binary functionDescriptor optional
XSD.Base64Binary functionDescriptor optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
SemanticMashupInstance semanticMashupInstance,
SemanticDescriptor semanticDescriptor,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record SemanticMashupInstance_optional
......@@ -2104,19 +2231,38 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI smjpID optional,
XSD.Base64Binary smjpInputParameter optional,
MashupMemberStoreType memberStoreType optional,
MashupMembers mashupMember optional,
MashupResultGenType resultGenType optional,
XSD.Duration periodForResultGen optional
XSD.Duration periodForResultGen optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
SemanticMashupResult semanticMashupResult,
SemanticDescriptor semanticDescriptor,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
......@@ -2133,16 +2279,30 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.ID custodian optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.Base64Binary smjpInputParameter optional,
Serializations mashupResultFormat optional,
XSD.Base64Binary mashupResult optional
XSD.Base64Binary mashupResult optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
SemanticDescriptor semanticDescriptor,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record ServiceSubscribedAppRule_optional
......@@ -2157,12 +2317,12 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfM2MID applicableCredIDs optional,
ListOfM2MID allowedApp_IDs optional,
ListOfM2MID allowedAEs optional,
record length(1 .. infinity) of RoleID allowedRole_IDs optional,
// TODO: To update once oneM2MTypes is updated
ListOfM2MID allowedUsers optional,
ListOfURIs allowedUsers optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -2197,6 +2357,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
NodeID nodeID optional,
XSD.ID cSE_ID optional,
record of DeviceID deviceIdentifier optional,
......@@ -2216,14 +2377,15 @@ group OptionalResourceTypes {
variant (resourceName) "attribute";
variant (cSE_ID) "name as 'CSE-ID'";
variant (deviceIdentifier) "list";
//variant (niddRequired) "text 'true' as '1'";
//variant (niddRequired) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
//TODO To be removed/replaced by the type defined in XSDs
type record ServiceSubscribedUserProfile_optional {
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -2235,7 +2397,8 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID M2M_User_ID optional,
XSD.ID custodian optional,
XSD.ID m2M_User_ID optional,
XSD.NonNegativeInteger maxNumAEs optional,
XSD.NonNegativeInteger maxNumNodes optional,
XSD.NonNegativeInteger maxNumBytes optional,
......@@ -2248,37 +2411,79 @@ group OptionalResourceTypes {
XSD.NonNegativeInteger maxNotificationRate optional,
XSD.NonNegativeInteger maxNumFlexContainers optional,
XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
SetOfAcrs defaultAccessControlPrivileges optional
SetOfAcrs defaultAccessControlPrivileges optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (m2M_User_ID) "name as 'M2M-User-ID'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record SoftwareCampaign_optional //added on Release-4
type record SoftwareCampaign_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID holder optional,
ListOfURIs announceTo optional,
XSD.ID announceSyncType optional,
ListOfNCNames announcedAttribute optional,
XSD.Boolean campaignEnabled optional,
ExecStatusType campaignStatus optional,
XSD.String version optional,
XSD.String softwareName optional,
XSD.AnyURI uRL optional,
ListOfM2MID softwareTargets optional,
Action_optional softwareTriggerCriteria optional,
SoftwareOperation softwareOperation optional,
ListOfM2MID softwareLinks optional,
AggregatedSoftwareStatus aggregatedSoftwareStatus optional,
XSD.String individualSoftwareStatus optional //ToDo - complete with tuple if used
};
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.Boolean campaignEnabled optional,
ExecStatusType campaignStatus optional,
XSD.String version optional,
XSD.String softwareName optional,
XSD.AnyURI uRL optional,
ListOfURIs softwareTargets optional,
ListOfSoftwareTriggerCriteria softwareTriggerCriteria optional,
SoftwareOperation softwareOperation optional,
ListOfURIs softwareLinks optional,
Status aggregatedSoftwareStatus optional,
ListOfActionStatuses individualSoftwareStatuses optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction,
Schedule schedule
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (campaignEnabled) "text 'true' as '1'";
//variant (campaignEnabled) "text 'false' as '0'";
variant (uRL) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record StatsCollect_optional
{
......@@ -2292,6 +2497,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
XSD.String statsCollectID optional,
XSD.ID collectingEntityID optional,
......@@ -2331,6 +2537,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
......@@ -2351,7 +2558,7 @@ group OptionalResourceTypes {
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record EventConfig_optional
{
ResourceName resourceName optional,
......@@ -2364,6 +2571,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
XSD.String eventID optional,
EventType eventType optional,
......@@ -2382,15 +2590,15 @@ group OptionalResourceTypes {
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (operationType) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (operationType) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record Subscription_optional
......@@ -2405,6 +2613,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
EventNotificationCriteria eventNotificationCriteria optional,
XSD.PositiveInteger expirationCounter optional,
......@@ -2421,6 +2630,9 @@ group OptionalResourceTypes {
EventCat notificationEventCat optional,
XSD.AnyURI subscriberURI optional,
ListOfURIs associatedCrossResourceSub optional,
XSD.Boolean notificationStatsEnable optional,
SetOfNotificationStatsInfo notificationStatsInfo optional,
XSD.AnyURI primitiveProfileID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -2436,13 +2648,15 @@ group OptionalResourceTypes {
variant (resourceName) "attribute";
//variant (latestNotify) "text 'true' as '1'";
//variant (latestNotify) "text 'false' as '0'";
//variant (notificationStatsEnable) "text 'true' as '1'";
//variant (notificationStatsEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record TimeSeries_optional
{
ResourceName resourceName optional,
......@@ -2455,15 +2669,19 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,//TODO A list that can be empty
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.ID creator optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger currentNrOfInstances optional,
XSD.NonNegativeInteger currentByteSize optional,
XSD.PositiveInteger periodicInterval optional,
XSD.NonNegativeInteger periodicIntervalDelta optional,
XSD.Boolean missingDataDetect optional,
XSD.PositiveInteger missingDataMaxNr optional,
MissingDataList missingDataList optional,
......@@ -2509,12 +2727,14 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger currentNrOfInstances optional,
XSD.NonNegativeInteger currentByteSize optional,
XSD.PositiveInteger periodicInterval optional,
XSD.NonNegativeInteger periodicIntervalDelta optional,
XSD.PositiveInteger missingDataMaxNr optional,
MissingDataList missingDataList optional,
XSD.NonNegativeInteger missingDataCurrentNr optional,
......@@ -2537,15 +2757,13 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
//variant (missingDataDetect) "text 'true' as '1'";
//variant (missingDataDetect) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record TimeSeriesInstance_optional
{
ResourceName resourceName optional,
......@@ -2558,10 +2776,11 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
XSD.NonNegativeInteger contentSize optional,
XSD.NonNegativeInteger contentSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -2575,6 +2794,11 @@ group OptionalResourceTypes {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
......@@ -2605,8 +2829,13 @@ group OptionalResourceTypes {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record DynamicAuthorizationConsultation_optional
{
ResourceName resourceName optional,
......@@ -2619,8 +2848,9 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.Boolean dynamicAuthorizationEnabled,
ListOfURIs dynamicAuthorizationPoA optional,
XSD.ID custodian optional,
XSD.Boolean dynamicAuthorizationEnabled optional,
PoaList dynamicAuthorizationPoA optional,
Timestamp dynamicAuthorizationLifetime optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
......@@ -2655,6 +2885,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
RoleID roleID optional,
XSD.ID issuer optional,
XSD.ID holder optional,
......@@ -2667,7 +2898,7 @@ group OptionalResourceTypes {
record length(1 .. infinity) of union {
Subscription subscription,
Transaction transaction
} choice_list
} choice_list
} choice optional
}
with {
......@@ -2693,8 +2924,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2738,8 +2971,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2777,8 +3012,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2814,8 +3051,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2852,8 +3091,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2888,8 +3129,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2924,8 +3167,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -2965,8 +3210,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3003,8 +3250,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3041,8 +3290,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3077,8 +3328,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3115,8 +3368,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3150,8 +3405,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3188,8 +3445,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3222,8 +3481,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3257,8 +3518,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3294,8 +3557,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3335,8 +3600,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3370,8 +3637,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3407,8 +3676,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3448,8 +3719,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3486,8 +3759,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3519,8 +3794,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3559,8 +3836,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3592,8 +3871,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3625,8 +3906,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3658,8 +3941,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3693,8 +3978,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3726,8 +4013,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3761,8 +4050,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3794,8 +4085,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3831,8 +4124,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3870,8 +4165,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3908,8 +4205,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3941,8 +4240,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -3976,8 +4277,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
......@@ -4009,8 +4312,10 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition optional,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
......@@ -4063,6 +4368,7 @@ group OptionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
TokenID tokenID optional,
DynAuthJWT tokenObject optional,
XSD.String version optional,
......@@ -4096,130 +4402,138 @@ group OptionalResourceTypes {
type record CrossResourceSubscription_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID creator optional,
ListOfURIs regularResourcesAsTarget optional,
ListOfURIs subscriptionResourcesAsTarget optional,
TimeWindowType timeWindowType optional,
AbsRelTimestamp timeWindowSize optional,
EventNotificationCriteriaSet eventNotificationCriteriaSet optional,
EventCat notificationEventCat optional,
XSD.PositiveInteger expirationCounter optional,
record of XSD.AnyURI notificationURI optional,
XSD.ID subscriberURI optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Schedule schedule,
NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
Transaction transaction
} choice_list
} choice optional
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
ListOfURIs regularResourcesAsTarget optional,
ListOfURIs subscriptionResourcesAsTarget optional,
ListOfURIs regularResourcesAsTargetSubscriptions optional,
TimeWindowType timeWindowType optional,
XSD.Duration timeWindowSize optional,
EventNotificationCriteriaSet eventNotificationCriteriaSet optional,
EventCat notificationEventCat optional,
XSD.PositiveInteger expirationCounter optional,
record of XSD.AnyURI notificationURI optional,
XSD.AnyURI subscriberURI optional,
XSD.Boolean notificationStatsEnable optional,
SetOfNotificationStatsInfo notificationStatsInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Schedule schedule,
NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (notificationURI) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (notificationURI) "list";
//variant (notificationStatsEnable) "text 'true' as '1'";
//variant (notificationStatsEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record TransactionMgmt_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
Timestamp transactionLockTime optional,
Timestamp transactionExecuteTime optional,
Timestamp transactionCommitTime optional,
Timestamp transactionExpirationTime optional,
TransactionMode transactionMode optional,
TransactionLockType transactionLockType optional,
TransactionControl transactionControl optional,
TransactionState transactionState optional,
XSD.NonNegativeInteger transactionMaxRetries optional,
TransactionMgmtHandling transactionMgmtHandling optional,
AggregatedRequest requestPrimitives optional,
AggregatedResponse responsePrimitives optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record TransactionMgmt_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID creator optional,
Timestamp transactionLockTime optional,
Timestamp transactionExecuteTime optional,
Timestamp transactionCommitTime optional,
Timestamp transactionExpirationTime optional,
TransactionMode transactionMode optional,
TransactionLockType transactionLockType optional,
TransactionControl transactionControl optional,
TransactionState transactionState optional,
XSD.NonNegativeInteger transactionMaxRetries optional,
TransactionMgmtHandling transactionMgmtHandling optional,
AggregatedRequest requestPrimitives optional,
AggregatedResponse responsePrimitives optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record Transaction_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID creator optional,
XSD.String transactionID optional,
TransactionControl transactionControl optional,
TransactionState transactionState optional,
Timestamp transactionLockTime optional,
Timestamp transactionExecuteTime optional,
Timestamp transactionCommitTime optional,
TransactionLockType transactionLockType optional,
RequestPrimitive requestPrimitive optional,
ResponsePrimitive responsePrimitive optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
XSD.String transactionID optional,
TransactionControl transactionControl optional,
TransactionState transactionState optional,
Timestamp transactionLockTime optional,
Timestamp transactionExecuteTime optional,
Timestamp transactionCommitTime optional,
TransactionLockType transactionLockType optional,
RequestPrimitive requestPrimitive optional,
ResponsePrimitive responsePrimitive optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
}//end group OptionalResourceTypes
......@@ -4241,8 +4555,11 @@ group InvalidTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
......@@ -4252,6 +4569,14 @@ group InvalidTypes {
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
ExternalID m2M_Ext_ID optional,
SupportedReleaseVersions supportedReleaseVersions optional,
AERegistrationStatus registrationStatus optional,
XSD.Boolean trackRegistrationPoints optional,
SessionCapabilities sessionCapabilities optional,
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -4260,10 +4585,19 @@ group InvalidTypes {
AccessControlPolicy accessControlPolicy,
Subscription subscription,
PollingChannel pollingChannel,
Schedule schedule,
SemanticDescriptor semanticDescriptor,
TimeSeries timeSeries,
Sg_flexContainerResource_group sg_flexContainerResource
Sg_flexContainerResource_group sg_flexContainerResource,
SemanticMashupInstance semanticMashupInstance,
MultimediaSession multimediaSession,
CrossResourceSubscription crossResourceSubscription,
TriggerRequest triggerRequest,
TransactionMgmt transactionMgmt,
Transaction transaction,
E2eQosSession e2eQosSession,
TimeSyncBeacon timeSyncBeacon,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
......@@ -4275,6 +4609,13 @@ group InvalidTypes {
variant (aE_ID) "name as 'AE-ID'";
//variant (requestReachability) "text 'true' as '1'";
//variant (requestReachability) "text 'false' as '0'";
variant (m2M_Ext_ID) "name as 'M2M-Ext-ID'";
//variant (trackRegistrationPoints) "text 'true' as '1'";
//variant (trackRegistrationPoints) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -4329,15 +4670,18 @@ group InvalidTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.Integer stateTag optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.Integer maxNrOfInstances optional,
XSD.Integer maxByteSize optional,
XSD.Integer maxInstanceAge optional,
XSD.Integer currentNrOfInstances optional,
XSD.Integer currentByteSize optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger currentNrOfInstances optional,
XSD.NonNegativeInteger currentByteSize optional,
XSD.AnyURI locationID optional,
XSD.AnyURI ontologyRef optional,
XSD.Boolean disableRetrieval optional,
......@@ -4348,13 +4692,15 @@ group InvalidTypes {
Container container,
Subscription subscription,
SemanticDescriptor semanticDescriptor,
Sg_flexContainerResource_group sg_flexContainerResource
Sg_flexContainerResource_group sg_flexContainerResource,
TimeSeries timeSeries,
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
//variant "element";
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
//variant (disableRetrieval) "text 'true' as '1'";
......@@ -4392,8 +4738,8 @@ group InvalidTypes {
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
GenericInterworkingService genericInterworkingService,
GenericInterworkingOperationInstance genericInterworkingOperationInstance,
GenericInterworkingService_optional genericInterworkingService,
GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
SemanticDescriptor semanticDescriptor,
Subscription subscription
} choice_list
......@@ -4422,23 +4768,30 @@ group InvalidTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
XSD.ID creator optional,
MemberType memberType optional,
SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers optional,
XSD.PositiveInteger maxNrOfMembers optional,
ListOfURIs memberIDs optional,
record of XSD.AnyURI memberIDs optional,
ListOfURIs membersAccessControlPolicyIDs optional,
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
XSD.Boolean semanticSupportIndicator optional,
BatchNotify notifyAggregation optional,
XSD.Boolean somecastEnable optional,
SomecastAlgorithm somecastAlgorithm optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
SemanticDescriptor semanticDescriptor
SemanticDescriptor semanticDescriptor,
Transaction transaction
} choice_list
} choice optional
}
......@@ -4447,17 +4800,19 @@ group InvalidTypes {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
variant (memberIDs) "list";
//variant (memberTypeValidated) "text 'true' as '1'";
//variant (memberTypeValidated) "text 'false' as '0'";
//variant (semanticSupportIndicator) "text 'true' as '1'";
//variant (semanticSupportIndicator) "text 'false' as '0'";
//variant (somecastEnable) "text 'true' as '1'";
//variant (somecastEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record PollingChannel_invalid {
ResourceName resourceName optional,
......@@ -4468,12 +4823,24 @@ group InvalidTypes {
Timestamp lastModifiedTime optional,
XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
Labels labels optional,
Timestamp expirationTime optional
Timestamp expirationTime optional,
XSD.Boolean requestAggregation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Transaction transaction
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record Schedule_invalid {
......@@ -4515,11 +4882,12 @@ group InvalidTypes {
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
Labels labels optional,
XSD.NonNegativeInteger maxNrOfInstances optional,//Invalid field, non existing for Subscription
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
XSD.ID creator optional,
EventNotificationCriteria eventNotificationCriteria optional,
XSD.PositiveInteger expirationCounter optional,
......@@ -4535,11 +4903,16 @@ group InvalidTypes {
NotificationContentType notificationContentType optional,
EventCat notificationEventCat optional,
XSD.AnyURI subscriberURI optional,
ListOfURIs associatedCrossResourceSub optional,
XSD.Boolean notificationStatsEnable optional,
SetOfNotificationStatsInfo notificationStatsInfo optional,
XSD.AnyURI primitiveProfileID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Schedule schedule,
NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
Transaction transaction
} choice_list
} choice optional
}
......@@ -4549,6 +4922,8 @@ group InvalidTypes {
variant (resourceName) "attribute";
//variant (latestNotify) "text 'true' as '1'";
//variant (latestNotify) "text 'false' as '0'";
//variant (notificationStatsEnable) "text 'true' as '1'";
//variant (notificationStatsEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
......@@ -4569,29 +4944,33 @@ group InvalidTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.NonNegativeInteger stateTag optional,
AnnounceSyncType announceSyncType optional,
XSD.ID creator optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger currentNrOfInstances optional,
XSD.NonNegativeInteger currentByteSize optional,
XSD.NonNegativeInteger periodicInterval optional,
XSD.PositiveInteger periodicInterval optional,
XSD.NonNegativeInteger periodicIntervalDelta optional,
XSD.Boolean missingDataDetect optional,
XSD.NonNegativeInteger missingDataMaxNr optional,
XSD.PositiveInteger missingDataMaxNr optional,
MissingDataList missingDataList optional,
XSD.NonNegativeInteger missingDataCurrentNr optional,
XSD.NonNegativeInteger missingDataDetectTimer optional,
XSD.PositiveInteger missingDataDetectTimer optional,
XSD.AnyURI ontologyRef optional,
ContentInfo contentInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
TimeSeriesInstance_optional timeSeriesInstance,
Subscription_optional subscription,
SemanticDescriptor_optional semanticDescriptor
TimeSeriesInstance timeSeriesInstance,
Subscription subscription,
SemanticDescriptor semanticDescriptor,
Transaction transaction
} choice_list
} choice optional
}
......@@ -4608,8 +4987,6 @@ group InvalidTypes {
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record LocationPolicy_invalid {
ResourceName resourceName optional,
......@@ -4663,13 +5040,6 @@ group OtherTypes {
type record length(1 .. infinity) of DynAuthJWT RecordOfDynAuthJWT;
type enumerated PrimitiveProfileApplicability {
REQUESTS_TO_CSE (1),
RESPONSES_FROM_CSE (2),
REQUESTS_FROM_CSE (4),
RESPONSES_TO_CSE (8)
}
type enumerated SyncPoints {
e_done (0),
e_error (1)
......@@ -4789,7 +5159,7 @@ group OtherTypes {
OntologyRepository_optional ontologyRepository,
Ontology_optional ontology,
PollingChannel_optional pollingChannel,
PrimitveProfile_optional primitveProfile,
PrimitiveProfile_optional primitiveProfile,
ProcessManagement_optional processManagement, //2021 added processManagement
State_optional state, //2021 added state
Action_optional action_, //2021 added action
......@@ -4877,6 +5247,7 @@ group OtherTypes {
AggregatedResponse aggregatedResponse,
URI uRI,
RequestPrimitive requestPrimitive,
AggregatedRequestPrimitives aggregatedRequestPrimitives,
DebugInfo debugInfo,
//Invalid types
AE_invalid aE_invalid,
......@@ -5162,6 +5533,17 @@ group Values {
}//end of Values group
group PatternValues {
const universal charstring c_point := "(\[[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))[,][\q{0,0,0,32}\t]#(0,)[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1))([,]\d#(1,))#(0,1)\])";
template universal charstring c_multipoint := pattern "^\[{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(0,)\]$";
template universal charstring c_lineStringOrMultipoint:= pattern "\[{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(1,)\]";
template universal charstring c_multiLineString := pattern "^\[{c_lineStringOrMultipoint}([,][\q{0,0,0,32}\t]#(0,){c_lineStringOrMultipoint})#(0,)\]$";
template universal charstring c_polygon := pattern "\[#2{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(3,)\]#2";//Original pattern cannot be done in TTCN, first and last element must be equal and this cannot be matched by using the pattern "\[#2(?P<FirstPoint>{c_point})(,[\q{0,0,0,32}\t]#(0,){c_point})#(2,)(,[\q{0,0,0,32}\t]#(0,)(?P=FirstPoint)\]#2)";
template universal charstring c_multipolygon := pattern "^\[{c_polygon}(,[\q{0,0,0,32}\t]#(0,){c_polygon})#(0,)\]$";
}//end of PatternValues group
}
// end of module
......
oneM2M_Types @ af7a0093
Compare 7f2b3a92...af7a0093
Subproject commit 7f2b3a92d6f12731cc6c3ba32ecaa8a2a3ca37a4
Subproject commit af7a0093b851fd5a184d9cc2955c46bcbfe379d0
OneM2M_PermutationFunctions.ttcn
View file @ 24aa5a3a
......@@ -9567,8 +9567,8 @@ module OneM2M_PermutationFunctions {
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var Labels v_labels := {"VALUE_1"};
var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
var ListOfCoordinates v_location_2 := {-4.4216366, 36.7213028};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
......@@ -9646,8 +9646,8 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex_1 := -1;
var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
var ListOfCoordinates v_location_2 := {-4.4216366, 36.7213028};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
......@@ -9716,7 +9716,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
var AttributeAux v_invalidAttribute;
......@@ -9783,7 +9783,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex_1 := -1;
var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
const ResourceType c_containerResourceType := int3;
......@@ -9999,8 +9999,8 @@ module OneM2M_PermutationFunctions {
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var Labels v_labels := {"VALUE_0"};
var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
var ListOfCoordinates v_location_2 := {-4.4216366, 36.7213028};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var integer i;
 
// Test control
......@@ -10083,7 +10083,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var integer v_childResourceIndex := -1;
var Labels v_labels := {"VALUE_0"};
var ListOfCoordinates v_location := {2.3514616, 48.8566969};
var ListOfCoordinates v_location := "[2.3514616,48.8566969]";
 
// Test control
if(not(PICS_ACP_SUPPORT)) {
......@@ -10160,7 +10160,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var integer v_childResourceIndex := -1;
var Labels v_labels := {"VALUE_0"};
var ListOfCoordinates v_location := {2.3514616, 48.8566969};
var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
 
// Test control
if(not(PICS_ACP_SUPPORT)) {
......@@ -10726,9 +10726,8 @@ module OneM2M_PermutationFunctions {
var Labels v_labels_1:= {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var RequestPrimitive v_notificationRequest;
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_1 := float2int(PX_TAC/2.0);
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
// Test control
 
// Test component configuration
......@@ -10741,7 +10740,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NotInitialized");
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1, e_nonHierarchical, e_cseRelative), f_getResourceAddress(v_resourceIndex_2, e_nonHierarchical, e_cseRelative)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
......@@ -10750,16 +10749,12 @@ module OneM2M_PermutationFunctions {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest_1.filterCriteria.labels := v_labels_1;
v_updateRequest_1.primitiveContent.container.labels := v_labels_1;
f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1
v_updateRequest_2.filterCriteria.labels := v_labels_2;
v_updateRequest_2.primitiveContent.container.labels := v_labels_2;
f_cse_updateResource(int3, v_resourceIndex_2, v_updateRequest_2); // Update request 2
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......@@ -10788,15 +10783,14 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var integer v_resourceIndex_1 := -1;
var integer v_resourceIndex_2 := -1;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequest := m_createContainer_noResourceName;
const ResourceType c_containerResourceType := int3;
var template RequestPrimitive v_updateRequest_1 := m_updateContainerBase;
var template RequestPrimitive v_updateRequest_2 := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var RequestPrimitive v_notificationRequest;
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_1 := float2int(PX_TAC / 2.0);
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
timer t_notificationTimer := PX_TAC;
var float v_elapsedTime;
......@@ -10812,7 +10806,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
......@@ -10820,25 +10814,22 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex_1);//CrossResourceSubscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler());
t_notificationTimer.start;
v_updateRequest_1.filterCriteria.labels := v_labels_1;
v_updateRequest_1.primitiveContent.container.labels := v_labels_1;
f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1
t_notificationTimer.start;
v_elapsedTime := t_notificationTimer.read;
while (v_elapsedTime < int2float(myAbsRelTimestamp.alt_1)){ // Wait until window size expires
//v_myAbsRelTimestamp = 2.0 seconds
while (v_elapsedTime < 2.0){ // Wait until window size expires
v_elapsedTime := t_notificationTimer.read;
}
t_notificationTimer.stop;
v_updateRequest_2.filterCriteria.labels := v_labels_2;
v_updateRequest_2.primitiveContent.container.labels := v_labels_2;
f_cse_updateResource(int3, v_resourceIndex_2, v_updateRequest_2); // Update request 2
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......@@ -10859,15 +10850,14 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var integer v_resourceIndex_1 := -1;
var integer v_resourceIndex_2 := -1;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequest := m_createContainer_noResourceName;
const ResourceType c_containerResourceType := int3;
var template RequestPrimitive v_updateRequest_1 := m_updateContainerBase;
var template RequestPrimitive v_updateRequest_2 := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var RequestPrimitive v_notificationRequest;
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_1 := float2int(PX_TAC / 2.0);
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
// Test control
 
......@@ -10881,7 +10871,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int2})}; // Delete_of_Resource
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
......@@ -10889,18 +10879,14 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex_1);//CrossResourceSubscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler());
v_updateRequest_1.filterCriteria.labels := v_labels_1;
v_updateRequest_1.primitiveContent.container.labels := v_labels_1;
f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1
v_updateRequest_2.filterCriteria.labels := v_labels_2;
v_updateRequest_2.primitiveContent.container.labels := v_labels_2;
f_cse_updateResource(int3, v_resourceIndex_2, v_updateRequest_2); // Update request 2
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......@@ -10923,16 +10909,15 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex_2 := -1;
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequest := m_createContainer_noResourceName;
const ResourceType c_containerResourceType := int3;
var template RequestPrimitive v_updateRequest_1 := m_updateContainerBase;
var template RequestPrimitive v_updateRequest_2 := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var RequestPrimitive v_notificationRequest;
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_1 := float2int(PX_TAC/2.0);
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
// Test control
 
// Test component configuration
......@@ -10941,16 +10926,16 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
 
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe();//c_CRUDNDi);
v_aeIndex_1 := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2
v_createRequest := m_createSubscriptionBase;
v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_1);//Subscription_1
v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_2);//Subscription_2
v_childResourceIndex_2 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_2);//Subscription_2
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {f_getResourceAddress(v_childResourceIndex_1), f_getResourceAddress(v_childResourceIndex_2)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
......@@ -10958,16 +10943,12 @@ module OneM2M_PermutationFunctions {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest_1.filterCriteria.labels := v_labels_1;
v_updateRequest_1.primitiveContent.container.labels := v_labels_1;
f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1
v_updateRequest_2.filterCriteria.labels := v_labels_2;
v_updateRequest_2.primitiveContent.container.labels := v_labels_2;
f_cse_updateResource(int3, v_resourceIndex_2, v_updateRequest_2); // Update request 2
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......@@ -10998,15 +10979,14 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex_2 := -1;
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequest := m_createContainer_noResourceName;
const ResourceType c_containerResourceType := int3;
var template RequestPrimitive v_updateRequest_1 := m_updateContainerBase;
var template RequestPrimitive v_updateRequest_2 := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var RequestPrimitive v_notificationRequest;
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_1 := float2int(PX_TAC / 2.0);
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
timer t_notificationTimer := PX_TAC;
var float v_elapsedTime;
......@@ -11018,16 +10998,16 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
 
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe();//c_CRUDNDi);
v_aeIndex_1 := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2
v_createRequest := m_createSubscriptionBase;
v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_1);//Subscription_1
v_childResourceIndex_1 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_2);//Subscription_2
v_childResourceIndex_2 := f_cse_createResource(int23, v_createRequest, v_resourceIndex_2);//Subscription_2
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, myAbsRelTimestamp, "NullValue");
v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, p_timeWindowType, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {f_getResourceAddress(v_childResourceIndex_1), f_getResourceAddress(v_childResourceIndex_2)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
......@@ -11035,24 +11015,21 @@ module OneM2M_PermutationFunctions {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler());
t_notificationTimer.start;
v_updateRequest_1.filterCriteria.labels := v_labels_1;
v_updateRequest_1.primitiveContent.container.labels := v_labels_1;
f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1
t_notificationTimer.start;
v_elapsedTime := t_notificationTimer.read;
while (v_elapsedTime < int2float(myAbsRelTimestamp.alt_1)){ // Wait until window size expires
//v_myAbsRelTimestamp = 2.0 seconds
while (v_elapsedTime < 2.0){ // Wait until window size expires
v_elapsedTime := t_notificationTimer.read;
}
t_notificationTimer.stop;
v_updateRequest_2.filterCriteria.labels := v_labels_2;
v_updateRequest_2.primitiveContent.container.labels := v_labels_2;
f_cse_updateResource(int3, v_resourceIndex_2, v_updateRequest_2); // Update request 2
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......@@ -11064,6 +11041,204 @@ module OneM2M_PermutationFunctions {
f_cf01Down();
} // end f_CSE_SUB_NTF_016
function f_CSE_SUB_NTF_xx2(template (omit) EventNotificationCriteriaSet p_eventNotificationCriteriaSet) runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex_1 := -1;
var integer v_aeIndex_2 := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndex_1 := -1;
var template RequestPrimitive v_createRequest := m_createContainer_noResourceName;
const ResourceType c_containerResourceType := int3;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn)}, -);//c_CRUDNDi);
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1, e_nonHierarchical, e_cseRelative)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet := p_eventNotificationCriteriaSet;
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
// Test Body
v_createRequest := f_getCreateRequestPrimitive(int48, v_createRequest, v_aeIndex_1);
f_send(e_mcaPort, m_request(valueof(v_createRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": CrossResourceSubscription CREATE request rejected because neither regularResourcesAsTarget nor subscriptionResourcesAsTarget attribute are present");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": CrossResourceSubscription CREATE request accepted without having regularResourcesAsTarget nor subscriptionResourcesAsTarget attributes");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription CREATE request");
}
}
if(vc_ae2.running) {
vc_ae2.stop;
};
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // end f_CSE_SUB_NTF_xx2
function f_CSE_SUB_NTF_xx7(template RequestPrimitive p_updateRequest) runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var template RequestPrimitive v_createRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
// Test control
// Test component configuration
f_cf02Up();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, m_createAcpBase); // AE child resource
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
v_originatorResourceAddress := f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
vc_cse1.start(f_cse_createResourceHandler(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress), -));
v_crossResourceSubscriptionIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
// Test Body
p_updateRequest := f_getUpdateRequestPrimitive(int48, v_crossResourceSubscriptionIndex, p_updateRequest);
f_send(e_mcaPort, m_request(valueof(p_updateRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": CrossResourceSubscription UPDATE request rejected because NP attribute is present");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": CrossResourceSubscription UPDATE request accepted with NP attribute being present");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription UPDATE request");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf02Down();
} // end f_CSE_SUB_NTF_xx7
function f_CSE_SUB_NTF_xx8(template RequestPrimitive p_updateRequest) runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex_1 := -1;
var integer v_aeIndex_2 := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndex_1 := -1;
var integer v_resourceIndex_2 := -1;
var template RequestPrimitive v_createRequest := m_createContainer_noResourceName;
const ResourceType c_containerResourceType := int3;
var template RequestPrimitive v_updateRequest_1 := m_updateContainerBase;
var template RequestPrimitive v_updateRequest_2 := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var RequestPrimitive v_notificationRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT5S";
var float v_elapsedTime;
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe();//c_CRUDNDi);
v_resourceIndex_1 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_1
v_resourceIndex_2 := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex_1);//Container_2
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {f_getResourceAddress(v_resourceIndex_1), f_getResourceAddress(v_resourceIndex_2)};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria({int1})}; // Update_of_Resource
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
v_resourceIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex_1);//CrossResourceSubscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler());
v_updateRequest_1.primitiveContent.container.labels := v_labels_1;
f_cse_updateResource(int3, v_resourceIndex_1, v_updateRequest_1); // Update request 1
//Update crossResourceSubscription resource (twt or tws) so that time window is restarted
f_cse_updateResource(int48, v_resourceIndex, p_updateRequest);
// Giving enough time to restart the time window
f_sleep(2.0);
//Update of second container should be taken as the only notification received within the new time window
v_updateRequest_2.primitiveContent.container.labels := v_labels_2;
f_cse_updateResource(int3, v_resourceIndex_2, v_updateRequest_2); // Update request 2
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // end f_CSE_SUB_NTF_xx8
 
}//end group Notify
......
OneM2M_Testcases_CSE_Release_3.ttcn
View file @ 24aa5a3a
......@@ -933,7 +933,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"rateLimit"};
v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
v_createRequest.primitiveContent.subscription.rateLimit := {0, "PT20M"};
v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
v_ae1.done;
......
OneM2M_Testcases_CSE_Release_4.ttcn
View file @ 24aa5a3a
Changes suppressed. Click to show.
......@@ -925,7 +925,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test Body
v_evalcriteria.subject := "tempContainer.content"; //string example
v_evalcriteria.operator := int1; // equal
v_evalcriteria.threshold := 3;
v_evalcriteria.threshold := "3";
v_request := f_getCreateRequestPrimitive(int65, m_createState(-, m_contentCreateStateWithStateTransitions(-, m_stateTransitions(v_evalcriteria,"non_existing_state"))), v_aeIndex);
 
f_send(e_mcaPort, m_request(valueof(v_request)));
......@@ -983,7 +983,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test Body
v_evalcriteria.subject := "tempContainer.content"; //string example
v_evalcriteria.operator := int1; // equal
v_evalcriteria.threshold := 3;
v_evalcriteria.threshold := "3";
v_requeststate := m_createState(-, m_contentCreateStateWithStateTransitions(-, m_stateTransitions(v_evalcriteria,"")));
v_resourceState := f_cse_createResource(int65, v_requeststate, v_aeIndex);
......@@ -1048,7 +1048,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test Body
v_evalcriteria.subject := "tempResource.content"; //string example
v_evalcriteria.operator := int1; // equals
v_evalcriteria.threshold := 3;
v_evalcriteria.threshold := "3";
v_requeststate := m_createState(-, m_contentCreateStateWithStateTransitions(-, m_stateTransitions(v_evalcriteria,"")));
v_request := f_getCreateRequestPrimitive(int65, v_requeststate, -1);
......@@ -1345,7 +1345,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_evalcriteria.subject := v_invalidAttribute; // not matching subjectResourceID attributes
v_evalcriteria.operator := int1; // equal
v_evalcriteria.threshold := 3;
v_evalcriteria.threshold := "3";
v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
f_send(e_mcaPort, m_request(valueof(v_request)));
......@@ -1402,7 +1402,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_evalcriteria.subject := v_invalidAttribute; // not matching subjectResourceID attributes
v_evalcriteria.operator := int1; // equal
v_evalcriteria.threshold := 3;
v_evalcriteria.threshold := "3";
v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
f_send(e_mcaPort, m_request(valueof(v_request)));
......@@ -1459,7 +1459,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_evalcriteria.subject := v_attributeSet;
v_evalcriteria.operator := int1; // equal
v_evalcriteria.threshold := -1;
v_evalcriteria.threshold := "-1";
v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
f_send(e_mcaPort, m_request(valueof(v_request)));
......@@ -1516,7 +1516,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_evalcriteria.subject := v_attributeSet;
v_evalcriteria.operator := int3; // operator set to invalid value as greater does not apply to NCName
v_evalcriteria.threshold := 2;
v_evalcriteria.threshold := "2";
v_request.primitiveContent.action_.evalCriteria := v_evalcriteria;
f_send(e_mcaPort, m_request(valueof(v_request)));
......@@ -1682,7 +1682,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_request.primitiveContent.dependency.referencedResourceID := f_getResourceId(vc_resourcesList[v_resourceIndex].resource);
v_evalcriteria.subject := v_invalidAttribute;
v_evalcriteria.operator := int1;
v_evalcriteria.threshold := 2;
v_evalcriteria.threshold := "2";
 
f_send(e_mcaPort, m_request(valueof(v_request)));
tc_ac.start;
......@@ -1738,7 +1738,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_request := f_getCreateRequestPrimitive(int64, m_createDependencyBase, v_aeIndex);
v_evalcriteria.subject := v_attributeSet;
v_evalcriteria.operator := int1;
v_evalcriteria.threshold := -1;
v_evalcriteria.threshold := "-1";
 
f_send(e_mcaPort, m_request(valueof(v_request)));
tc_ac.start;
......@@ -1794,7 +1794,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_request := f_getCreateRequestPrimitive(int64, m_createDependencyBase, v_aeIndex);
v_evalcriteria.subject := v_attributeSet;
v_evalcriteria.operator := int3; // operator set to invalid value as greater does not apply to NCName
v_evalcriteria.threshold := 1;
v_evalcriteria.threshold := "1";
 
f_send(e_mcaPort, m_request(valueof(v_request)));
tc_ac.start;
......@@ -2687,163 +2687,1568 @@ module OneM2M_Testcases_CSE_Release_4 {
 
} // end TC_CSE_SUB_NTF_023
}//end group Notify
group Update {
}//end group Update
group Delete {
}//end group Delete
}//end group Subscription_And_Notification
group Security {
group authentication {
group ESPrim {
group Notify{
}//end group Notify
/** @desc Check that the IUT rejects a crossResourceSubscription CREATE request if neither regularResourcesAsTarget nor subscriptionResourcesAsTarget attributes are present
*
*/
testcase TC_CSE_SUB_NTF_xx1() runs on Tester system CseSystem {
}//end group ESPrim
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_xx1());
v_ae1.done;
}
group Role_Based_Access_Control { // TODO To be moved to authorization group
function f_CSE_SUB_NTF_xx1() runs on AeSimu system CseSystem {
group Create{
}//end group Create
// Local variables
var integer v_aeIndex_1 := -1;
var integer v_aeIndex_2 := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
group Retrieve {
}// end of group Retrieve
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn)}, -);//c_CRUDNDi);
group Update {
}//end group Update
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {f_getResourceAddress(v_aeIndex_2)}, -, v_myAbsRelTimestamp);
f_cse_preamble_subscriptionVerification(v_aeIndex_2, v_createRequest, int48);//AE2 registration
group Notify {
}//end group Notify
// Test Body
v_createRequest := f_getCreateRequestPrimitive(int48, v_createRequest, v_aeIndex_1);
f_send(e_mcaPort, m_request(valueof(v_createRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": CrossResourceSubscription CREATE request rejected because neither regularResourcesAsTarget nor subscriptionResourcesAsTarget attribute are present");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": CrossResourceSubscription CREATE request accepted without having regularResourcesAsTarget nor subscriptionResourcesAsTarget attributes");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription CREATE request");
}
}
}//end group Role_Based_Access_Control
group ESCertKE {
if(vc_ae2.running) {
vc_ae2.stop;
};
group Notify {
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
}// end of group Notify
}// end of group ESCertKE
group Access_Control_Policy { // TODO To be moved to authorization group
group Create{
}//end group Create
group Retrieve {
} // end f_CSE_SUB_NTF_xx1
group g_CSE_SUB_NTF_xx2 {
/**
* @desc Check that the IUT successfully returns the privileges of the ORIGINATOR on the TARGET_RESOURCE_ADDRESS when the RETRIEVE request contains Result Content set to permissions
*
* @desc Check that the IUT rejects a crossResourceSubscription CREATE request if the eventNotificationCriteriaSet attribute is set to EVENT_NOTIFICATION_CRITERIA_SET and regularResourcesAsTarget attribute is set
*
*/
testcase TC_CSE_SEC_ACP_RET_001() runs on Tester system CseSystem {
testcase TC_CSE_SUB_NTF_xx2_ENCS_NP() runs on Tester system CseSystem {
var AeSimu v_ae := AeSimu.create("AE1") alive;
v_ae.start(f_CSE_SEC_ACP_RET_001());
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae.done;
v_ae1.start(f_CSE_SUB_NTF_xx2(omit));
v_ae1.done;
}
testcase TC_CSE_SUB_NTF_xx2_ENCS_IV() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template EventNotificationCriteriaSet v_eventNotificationCriteriaSet;
var template EventNotificationCriteria v_eventNotificationCriteria_1 := m_eventNotificationCriteria ( {int1}, -);
var template EventNotificationCriteria v_eventNotificationCriteria_2 := m_eventNotificationCriteria ( {int2}, -);
v_eventNotificationCriteriaSet := {eventNotificationCriteriaEntry_list := {v_eventNotificationCriteria_1, v_eventNotificationCriteria_2}}
v_ae1.start(f_CSE_SUB_NTF_xx2(valueof(v_eventNotificationCriteriaSet)));
v_ae1.done;
}
function f_CSE_SEC_ACP_RET_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var RequestPrimitive v_createRequestAcp := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_retrieveRequest;
var AccessControlRule v_accessControlRule;
var PrimitiveContent v_primitiveContentRetrievedResource;
// Test control
// Test component configuration
f_cf01Up();
}//end group g_CSE_SUB_NTF_xx2
 
// Test adapter configuration
/** @desc Check that the IUT sends a subscription CREATE request to the target resource indicated in the regularResourcesAsTarget attribute of a crossResourceSubscription CREATE request
*
*/
testcase TC_CSE_SUB_NTF_xx3() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_CSE_SUB_NTF_xx3());
v_cse1.done;
}
function f_CSE_SUB_NTF_xx3() runs on CseSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var template RequestPrimitive v_createRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
// Test control
 
// Preamble
v_acpIndex := f_cse_createResource(int1, v_createRequestAcp); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
// Test component configuration
f_cf02UpCseSimuMaster();
// Test adapter configuration
 
v_accessControlRule := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, int59)); // c_CRDNDi
// TODO Check Content containing permissions ...
// pernissions only present is Token
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_aeIndex);
// Test Body
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_acpIndex), f_getOriginator(v_acpIndex)));
v_retrieveRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
v_retrieveRequest.resultContent := int12;
f_send(e_mcaPort, m_request(v_retrieveRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_primitiveContentRetrievedResource))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Successful Update operation on resource type int1 (Ae)");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while Update operation on resource type int2 (Ae)");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing update operation on resource type int2 (Ae)");
}
// Preamble
v_acpIndex := f_cse_createResource_cseSimu(int1, m_createAcpBase); // AE child resource
f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()}));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, -, -, { f_getLocalPoA(PX_TS_AE1.mcaPortIn) })));
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
v_originatorResourceAddress := f_getLatestResourceAddress(vc_ae1, e_nonHierarchical, e_spRelative);
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
// Test Body
vc_ae1.start(f_cse_createResource(int48, v_createRequest, v_aeIndex));
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress))) -> value vc_request {
setverdict(pass, __SCOPE__ & ": Subscription CREATE Request primitive received successfully");
f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
}
if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.aE)) {
if(not match (f_resourceIdCleaner(v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs[0]), v_retrieveRequest.primitiveContent.aE.accessControlPolicyIDs[0])){
setverdict(fail, __SCOPE__ & ": Error: Access Control policy ID attribute not updated correctly");
}
}
[] mccPortIn.receive(mw_request(mw_create(v_originatorResourceAddress, v_targetResourceAddress))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong CREATE request received");
f_send(e_mccPortIn, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
}
[] mccPortIn.receive(mw_request(?)) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong request received");
f_send(e_mccPortIn, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription CREATE request");
}
}
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Postamble
f_cse_postamble_deleteResourcesCSE();
//Tear down
f_cf02DownCseSimuMaster();
} // end f_CSE_SUB_NTF_xx3
 
//Postamble
f_cse_postamble_deleteResources();
/** @desc Check that the IUT rejects a crossResourceSubscription CREATE request if any subscription for a target resource indicated in the regularResourcesAsTarget attribute is not successfully created
*
*/
testcase TC_CSE_SUB_NTF_xx4() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_xx4());
v_ae1.done;
}
function f_CSE_SUB_NTF_xx4() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var template RequestPrimitive v_createRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
// Test control
 
//Tear down
f_cf01Down();
}//end TC_CSE_SEC_ACP_RET_001
// Test component configuration
f_cf02Up();
/**
* @desc Check that the IUT rejects a RETRIEVE request from the AE containing Result Content set to permissions when AE has no RETRIEVE privileges on the selfPrivileges attribute of <accessControlPolicy> resources associated with the TARGET_RESOURCE_ADDRESS resource
*
*/
testcase TC_CSE_SEC_ACP_RET_002() runs on Tester system CseSystem {
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, m_createAcpBase); // AE child resource
var AeSimu v_ae := AeSimu.create("AE1") alive;
v_ae.start(f_CSE_SEC_ACP_RET_002());
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
v_originatorResourceAddress := f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
// Test Body
vc_cse1.start(f_cse_createResourceHandler(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress), int4000));
v_createRequest := f_getCreateRequestPrimitive(int48, v_createRequest, v_aeIndex);
f_send(e_mcaPort, m_request(valueof(v_createRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5221))) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": CrossResourceSubscription CREATE request rejected because Subscription could not be created at target resource");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": CrossResourceSubscription CREATE request accepted without having successfully created Subscription resource at target resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription CREATE request");
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf02Down();
} // end f_CSE_SUB_NTF_xx4
/** @desc Check that the IUT sends a subscription UPDATE request to the subscription resource indicated in the subscriptionResourcesAsTarget attribute of a crossResourceSubscription CREATE request
*
*/
testcase TC_CSE_SUB_NTF_xx5() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_CSE_SUB_NTF_xx5());
v_cse1.done;
}
function f_CSE_SUB_NTF_xx5() runs on CseSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var template RequestPrimitive v_createRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
// Test control
// Test component configuration
f_cf02UpCseSimuMaster();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource_cseSimu(int1, m_createAcpBase); // AE child resource
f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()}));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, -, -, { f_getLocalPoA(PX_TS_AE1.mcaPortIn) })));
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
v_originatorResourceAddress := f_getLatestResourceAddress(vc_ae1, e_nonHierarchical, e_spRelative);
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentSubscription(m_contentCreateSubscription({"WhateverTarget"}))), vc_cSEBaseIndex, int23);
v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {v_targetResourceAddress};
// Test Body
vc_ae1.start(f_cse_createResource(int48, v_createRequest, v_aeIndex));
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_updateSubscription(v_originatorResourceAddress, v_targetResourceAddress))) -> value vc_request {
setverdict(pass, __SCOPE__ & ": Subscription UPDATE Request primitive received successfully");
f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
}
[] mccPortIn.receive(mw_request(mw_update(v_originatorResourceAddress, v_targetResourceAddress))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong UPDATE request received");
f_send(e_mccPortIn, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription CREATE request");
}
}
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Postamble
f_cse_postamble_deleteResourcesCSE();
//Tear down
f_cf02DownCseSimuMaster();
} // end f_CSE_SUB_NTF_xx5
/** @desc Check that the IUT records notification statistics in the notificationStatsInfo attribute of the crossResourceSubscription resource if the notificationStatsEnable attribute of the crossResourceSubscription CREATE request is set to TRUE
*
*/
testcase TC_CSE_SUB_NTF_xx6() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_xx6());
v_ae1.done;
}
function f_CSE_SUB_NTF_xx6() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
var template PrimitiveContent v_retrieveContentResponse;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template Notification v_notification;
v_retrieveContentResponse.crossResourceSubscription := mw_contentCrossResourceSubscriptionBase;
// Test control
// Test component configuration
f_cf02Up();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, m_createAcpBase); // AE child resource
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
//v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
v_targetResourceIndex := f_getLatestLocalResource(vc_cse1);
v_originatorResourceAddress := f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
v_createRequest.primitiveContent.crossResourceSubscription.notificationStatsEnable := true;
vc_cse1.start(f_cse_createResourceHandler(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress), -));
v_crossResourceSubscriptionIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_subscriptionIndex := f_getLatestLocalResource(vc_cse1);
//Simulating update of the target resource and sending a notification from CSE1
v_notification := m_contentNotificationEmpty;
v_notification.subscriptionReference := f_getLatestLocalResourceAddress(vc_cse1, e_nonHierarchical, e_spRelative);
v_notification.notificationEvent.notificationEventType := int1;
v_notification.notificationEvent.operationMonitor := omit;
v_notification.notificationEvent.representation.resource := vc_resourcesList[v_targetResourceIndex].resource;
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(m_notifyNotification(vc_resourcesList[v_subscriptionIndex].resource.subscription.notificationURI[0], valueof(v_notification), -))));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
f_cse_notifyProcedure_defaultHandler();
// Test Body
f_sleep(5.0);
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_crossResourceSubscriptionIndex), f_getOriginator(v_aeIndex)));
f_send(e_mcaPort, m_request(valueof(v_retrieveRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value vc_response {
tc_ac.stop;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo)) {
if((vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].requestsSent == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].responsesReceived == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].notificationEventCount == 1 )) {
setverdict(pass, __SCOPE__ & ": INFO: notifications recorded correctly");
}
else{
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded properly");
}
} else {
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf02Down();
} // end f_CSE_SUB_NTF_xx6
group g_CSE_SUB_NTF_xx7 {
/** @desc Check that the IUT rejects a crossResourceSubscription UPDATE request if ATTRIBUTE attribute is present
*
*/
testcase TC_CSE_SUB_NTF_xx7_RRAT() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
v_updateRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {"WhateverResourceTarget"} ;
v_ae1.start(f_CSE_SUB_NTF_xx7(v_updateRequest));
v_ae1.done;
}
testcase TC_CSE_SUB_NTF_xx7_SRAT() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
v_updateRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {"WhateverResourceTarget"} ;
v_ae1.start(f_CSE_SUB_NTF_xx7(v_updateRequest));
v_ae1.done;
}
testcase TC_CSE_SUB_NTF_xx7_ENCS() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
var template EventNotificationCriteria v_eventNotificationCriteria_1 := m_eventNotificationCriteria ( {int1}, -);
v_updateRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet := {eventNotificationCriteriaEntry_list := {v_eventNotificationCriteria_1}};
v_ae1.start(f_CSE_SUB_NTF_xx7(v_updateRequest));
v_ae1.done;
}
}//end group g_CSE_SUB_NTF_xx7
group g_CSE_SUB_NTF_xx8 {
/** @desc Check that the IUT restarts the time window for a crossResourceSubscription resource if ATTRIBUTE is properly updated
*
*/
testcase TC_CSE_SUB_NTF_xx8_TWT() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
v_updateRequest.primitiveContent.crossResourceSubscription.timeWindowType := int2 ;
v_ae1.start(f_CSE_SUB_NTF_xx8(v_updateRequest));
v_ae1.done;
}
testcase TC_CSE_SUB_NTF_xx8_TWS() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
v_updateRequest.primitiveContent.crossResourceSubscription.timeWindowSize := "PT10S";
v_ae1.start(f_CSE_SUB_NTF_xx8(v_updateRequest));
v_ae1.done;
}
}//end group g_CSE_SUB_NTF_xx8
/** @desc Check that the IUT restarts recording notification statistics in the notificationStatsInfo attribute of the crossResourceSubscription resource if the notificationStatsEnable attribute of the crossResourceSubscription UPDATE request is set to TRUE
*
*/
testcase TC_CSE_SUB_NTF_xx9() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_xx9());
v_ae1.done;
}
function f_CSE_SUB_NTF_xx9() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
var template PrimitiveContent v_retrieveContentResponse;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template Notification v_notification;
v_retrieveContentResponse.crossResourceSubscription := mw_contentCrossResourceSubscriptionBase;
// Test control
// Test component configuration
f_cf02Up();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, m_createAcpBase); // AE child resource
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
//v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
v_targetResourceIndex := f_getLatestLocalResource(vc_cse1);
v_originatorResourceAddress := f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
v_createRequest.primitiveContent.crossResourceSubscription.notificationStatsEnable := true;
vc_cse1.start(f_cse_createResourceHandler(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress), -));
v_crossResourceSubscriptionIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_subscriptionIndex := f_getLatestLocalResource(vc_cse1);
//Simulating update of the target resource and sending a notification from CSE1
v_notification := m_contentNotificationEmpty;
v_notification.subscriptionReference := f_getLatestLocalResourceAddress(vc_cse1, e_nonHierarchical, e_spRelative);
v_notification.notificationEvent.notificationEventType := int1;
v_notification.notificationEvent.operationMonitor := omit;
v_notification.notificationEvent.representation.resource := vc_resourcesList[v_targetResourceIndex].resource;
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(m_notifyNotification(vc_resourcesList[v_subscriptionIndex].resource.subscription.notificationURI[0], valueof(v_notification), -))));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
f_cse_notifyProcedure_defaultHandler();
//Update crossResourceSubscription notificationStatsEnable to True
v_updateRequest.primitiveContent.crossResourceSubscription.notificationStatsEnable := true;
f_cse_updateResource(int48, v_crossResourceSubscriptionIndex, v_updateRequest);
//Simulating second update of the target resource and sending another notification from CSE1
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(m_notifyNotification(vc_resourcesList[v_subscriptionIndex].resource.subscription.notificationURI[0], valueof(v_notification), -))));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
f_cse_notifyProcedure_defaultHandler();
// Test Body
f_sleep(5.0);
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_crossResourceSubscriptionIndex), f_getOriginator(v_aeIndex)));
f_send(e_mcaPort, m_request(valueof(v_retrieveRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value vc_response {
tc_ac.stop;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo)) {
if((vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].requestsSent == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].responsesReceived == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].notificationEventCount == 1 )) {
setverdict(pass, __SCOPE__ & ": INFO: notifications recorded correctly");
}
else{
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded properly");
}
} else {
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf02Down();
} // end f_CSE_SUB_NTF_xx9
/** @desc Check that the IUT stops recording notification statistics in the notificationStatsInfo attribute of the crossResourceSubscription resource if the notificationStatsEnable attribute of the crossResourceSubscription UPDATE request is set to FALSE and keeps the current value of the notificationStatsInfo
*
*/
testcase TC_CSE_SUB_NTF_x10() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_x10());
v_ae1.done;
}
function f_CSE_SUB_NTF_x10() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
var template PrimitiveContent v_retrieveContentResponse;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template Notification v_notification;
v_retrieveContentResponse.crossResourceSubscription := mw_contentCrossResourceSubscriptionBase;
// Test control
// Test component configuration
f_cf02Up();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, m_createAcpBase); // AE child resource
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
//v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
v_targetResourceIndex := f_getLatestLocalResource(vc_cse1);
v_originatorResourceAddress := f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
v_createRequest.primitiveContent.crossResourceSubscription.notificationStatsEnable := true;
vc_cse1.start(f_cse_createResourceHandler(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress), -));
v_crossResourceSubscriptionIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_subscriptionIndex := f_getLatestLocalResource(vc_cse1);
//Simulating update of the target resource and sending a notification from CSE1
v_notification := m_contentNotificationEmpty;
v_notification.subscriptionReference := f_getLatestLocalResourceAddress(vc_cse1, e_nonHierarchical, e_spRelative);
v_notification.notificationEvent.notificationEventType := int1;
v_notification.notificationEvent.operationMonitor := omit;
v_notification.notificationEvent.representation.resource := vc_resourcesList[v_targetResourceIndex].resource;
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(m_notifyNotification(vc_resourcesList[v_subscriptionIndex].resource.subscription.notificationURI[0], valueof(v_notification), -))));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
f_cse_notifyProcedure_defaultHandler();
//Update crossResourceSubscription notificationStatsEnable to False
v_updateRequest.primitiveContent.crossResourceSubscription.notificationStatsEnable := false;
f_cse_updateResource(int48, v_crossResourceSubscriptionIndex, v_updateRequest);
//Simulating second update of the target resource and sending another notification from CSE1
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(m_notifyNotification(vc_resourcesList[v_subscriptionIndex].resource.subscription.notificationURI[0], valueof(v_notification), -))));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
f_cse_notifyProcedure_defaultHandler();
// Test Body
f_sleep(5.0);
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_crossResourceSubscriptionIndex), f_getOriginator(v_aeIndex)));
f_send(e_mcaPort, m_request(valueof(v_retrieveRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value vc_response {
tc_ac.stop;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo)) {
if((vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].requestsSent == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].responsesReceived == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.crossResourceSubscription.notificationStatsInfo.notificationStats_list[0].notificationEventCount == 1 )) {
setverdict(pass, __SCOPE__ & ": INFO: notifications recording stopped and kept correctly");
}
else{
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not stopped properly");
}
} else {
setverdict(fail, __SCOPE__ & ": ERROR: Notifications recording stopped and current value not kept");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf02Down();
} // end f_CSE_SUB_NTF_x10
/** @desc Check that the IUT sends a Notify request to the subscriberURI attribute when the crossResourceSubscription resource is deleted
*
*/
testcase TC_CSE_SUB_NTF_x11() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_x11());
v_ae1.done;
}
function f_CSE_SUB_NTF_x11() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_originatorResourceAddress, v_targetResourceAddress;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
var template Notification v_notification;
// Test control
// Test component configuration
f_cf02Up();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, m_createAcpBase); // AE child resource
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
//v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -, int3));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_targetResourceAddress := f_getLatestLocalResourceAddress(vc_cse1, PX_ADDRESSING_METHOD, e_spRelative);
v_targetResourceIndex := f_getLatestLocalResource(vc_cse1);
v_originatorResourceAddress := f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_originatorResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
v_createRequest.primitiveContent.crossResourceSubscription.subscriberURI := v_originatorResourceAddress;
vc_cse1.start(f_cse_createResourceHandler(mw_createSubscription(v_originatorResourceAddress, v_targetResourceAddress), -));
v_crossResourceSubscriptionIndex := f_cse_createResource(int48, v_createRequest, v_aeIndex);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_subscriptionIndex := f_getLatestLocalResourceIndex(vc_cse1);
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_crossResourceSubscriptionIndex), f_getOriginator(v_crossResourceSubscriptionIndex))); // CrossResourceSubscription resource deletion request
vc_cse1.start(f_cse_deleteResourceHandler(v_subscriptionIndex)); // Handling deletion of subscription resource
// Test Body
f_send(e_mcaPort, m_request(v_deleteRequest));
v_notification.subscriptionReference := ?;
v_notification.notificationEvent := omit;
f_cse_notifyProcedure_subscriptionDeletionHandler(v_notification); // check that crossResourceSubscription notification deletion is received
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Subscription resource deleted successfully");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while deleting resource type int23 (Subscription)");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while deleting resource type int23 (Subscription)");
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
if(f_compareURIs(v_crossResourceSubscriptionIndex, vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionReference)) {
setverdict(pass, __SCOPE__ & ": SubscriptionReference set to crossResourceSubscription resource identifier");
} else {
setverdict(fail, __SCOPE__ & ": SubscriptionReference not set to crossResourceSubscription resource identifier");
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf02Down();
} // end f_CSE_SUB_NTF_x11
/** @desc Check that the IUT deletes the subscription resoruces created during the crossResourceSubscription creation when the crossResourceSubscription resource is deleted
*
*/
testcase TC_CSE_SUB_NTF_x12() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_CSE_SUB_NTF_x12());
v_cse1.done;
}
function f_CSE_SUB_NTF_x12() runs on CseSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_aeResourceAddress, v_targetResourceAddress, v_crossResourceSubscriptionAddress;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
var template Notification v_notification;
// Test control
// Test component configuration
f_cf02UpCseSimuMaster();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource_cseSimu(int1, m_createAcpBase); // CSEBase child resource
f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()}));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, -, -, { f_getLocalPoA(PX_TS_AE1.mcaPortIn) })));
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
v_aeResourceAddress := f_getLatestResourceAddress(vc_ae1, e_nonHierarchical, e_spRelative);
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_aeResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.regularResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
vc_ae1.start(f_cse_createResource(int48, v_createRequest, v_aeIndex));
v_subscriptionIndex := f_cse_createResourceHandler(mw_createSubscription(v_aeResourceAddress, v_targetResourceAddress), -);
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_crossResourceSubscriptionAddress := f_getLatestResourceAddress(vc_ae1, e_nonHierarchical, e_spRelative);
v_crossResourceSubscriptionIndex := f_getLatestResourceIndex(vc_ae1);
vc_ae1.start(f_cse_deleteResource(v_crossResourceSubscriptionIndex)); // Handling deletion of subscription resource
// Test Body
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_delete)) -> value vc_request {
tc_ac.stop;
v_targetResourceIndex := f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive, -, -);
if(v_targetResourceIndex == v_subscriptionIndex) {
setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
} else {
setverdict(fail, __SCOPE__&":INFO: Unexpected resource delete");
}
f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__&":INFO: No answer while retrieving resource");
}
}
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Postamble
f_cse_postamble_deleteResourcesCSE();
//Tear down
f_cf02DownCseSimuMaster();
} // end f_CSE_SUB_NTF_x12
/** @desc Check that the IUT updates the subscription resoruces indicated in the subscriptionResourcesAsTarget attribute to remove the resource identifier of the crossResourceSubscription from the subscription's associatedCrossResourceSub and notificationURI attributes when the crossResourceSubscription resource is deleted' when the crossResourceSubscription resource is deleted
*
*/
testcase TC_CSE_SUB_NTF_x13() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_CSE_SUB_NTF_x13());
v_cse1.done;
}
function f_CSE_SUB_NTF_x13() runs on CseSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var integer v_targetResourceIndex := -1;
var integer v_crossResourceSubscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var XSD.Duration v_myAbsRelTimestamp := "PT2S";
var XSD.ID v_aeResourceAddress, v_targetResourceAddress, v_crossResourceSubscriptionAddress;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
var template RequestPrimitive v_updateRequest;
// Test control
// Test component configuration
f_cf02UpCseSimuMaster();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource_cseSimu(int1, m_createAcpBase); // CSEBase child resource
f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()}));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, -, -, -, { f_getLocalPoA(PX_TS_AE1.mcaPortIn) })));
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
v_aeResourceAddress := f_getLatestResourceAddress(vc_ae1, e_nonHierarchical, e_spRelative);
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentSubscription(m_contentCreateSubscription({"WhateverTarget"}))), vc_cSEBaseIndex, int23);
v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
v_createRequest := m_createCrossResourceSubscription("NotInitialized", -, {v_aeResourceAddress}, -, v_myAbsRelTimestamp);
v_createRequest.primitiveContent.crossResourceSubscription.subscriptionResourcesAsTarget := {v_targetResourceAddress};
v_createRequest.primitiveContent.crossResourceSubscription.eventNotificationCriteriaSet.eventNotificationCriteriaEntry_list := {m_eventNotificationCriteria ( {int1}, -)};
vc_ae1.start(f_cse_createResource(int48, v_createRequest, v_aeIndex));
f_cse_updateResourceHandler(v_targetResourceIndex, mw_updateSubscription(v_aeResourceAddress, v_targetResourceAddress), -);
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_crossResourceSubscriptionAddress := f_getLatestResourceAddress(vc_ae1, e_nonHierarchical, e_spRelative);
v_crossResourceSubscriptionIndex := f_getLatestResourceIndex(vc_ae1);
vc_ae1.start(f_cse_deleteResource(v_crossResourceSubscriptionIndex)); // Handling deletion of subscription resource
// Test Body
v_updateRequest := mw_updateSubscription(v_aeResourceAddress, ?);
v_updateRequest.primitiveContent.subscription.notificationURI := {"WhateverTarget"};
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(v_updateRequest, {"associatedCrossResourceSub"})) -> value vc_request {
setverdict(pass, __SCOPE__ & ": Subscription UPDATE Request primitive received successfully");
f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive, -, v_targetResourceIndex);
f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
}
[] mccPortIn.receive(mw_request(mw_update(v_aeResourceAddress, ?))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong UPDATE request received");
f_send(e_mccPortIn, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing a CrossResourceSubscription CREATE request");
}
}
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Postamble
f_cse_postamble_deleteResourcesCSE();
//Tear down
f_cf02DownCseSimuMaster();
} // end f_CSE_SUB_NTF_x13
/** @desc Check that the IUT records notification statistics in the notificationStatsInfo attribute of the subscription resource if the notificationStatsEnable attribute of the subscription CREATE request is set to TRUE
*
*/
testcase TC_CSE_SUB_NTF_x14() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_x14());
v_ae1.done;
}
function f_CSE_SUB_NTF_x14() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_ae2Index := -1;
var integer v_acpIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var template PrimitiveContent v_retrieveContentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var template RequestPrimitive v_createSubscriptionRequest := m_createSubscriptionBase;
v_retrieveContentResponse.subscription := mw_contentSubscriptionBase;
v_createSubscriptionRequest.primitiveContent.subscription.notificationStatsEnable:= true;
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
f_cse_preamble_subscriptionVerification(v_ae2Index, v_createSubscriptionRequest, int23);
v_subscriptionIndex := f_cse_createResource(int23, v_createSubscriptionRequest, v_aeIndex);//Parent
//Update of the target resource
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest.primitiveContent.aE.labels := {"VALUE_1"};
f_cse_updateResource(int2, v_aeIndex, v_updateRequest);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
f_sleep(5.0);
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_subscriptionIndex), f_getOriginator(v_aeIndex)));
f_send(e_mcaPort, m_request(valueof(v_retrieveRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value vc_response {
tc_ac.stop;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo)) {
if((vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].requestsSent == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].responsesReceived == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].notificationEventCount == 1 )) {
setverdict(pass, __SCOPE__ & ": INFO: notifications recorded correctly");
}
else{
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded properly");
}
} else {
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // end f_CSE_SUB_NTF_x14
/** @desc Check that the IUT restarts recording notification statistics in the notificationStatsInfo attribute of the crossResourceSubscription resource if the notificationStatsEnable attribute of the crossResourceSubscription UPDATE request is set to TRUE
*
*/
testcase TC_CSE_SUB_NTF_x15() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_x15());
v_ae1.done;
}
function f_CSE_SUB_NTF_x15() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_ae2Index := -1;
var integer v_acpIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var template PrimitiveContent v_retrieveContentResponse;
var template RequestPrimitive v_updateRequestAe := m_updateAeBase;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
var template RequestPrimitive v_createSubscriptionRequest := m_createSubscriptionBase;
v_retrieveContentResponse.subscription := mw_contentSubscriptionBase;
v_createSubscriptionRequest.primitiveContent.subscription.notificationStatsEnable:= true;
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
f_cse_preamble_subscriptionVerification(v_ae2Index, v_createSubscriptionRequest, int23);
v_subscriptionIndex := f_cse_createResource(int23, v_createSubscriptionRequest, v_aeIndex);//Parent
//Update of the target resource
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest.primitiveContent.aE.labels := {"VALUE_1"};
f_cse_updateResource(int2, v_aeIndex, v_updateRequest);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Update subscription notificationStatsEnable to True
v_updateRequest.primitiveContent.subscription.notificationStatsEnable := true;
f_cse_updateResource(int23, v_subscriptionIndex, v_updateRequest);
//Second update of the target resource
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest.primitiveContent.aE.labels := {"VALUE_1"};
f_cse_updateResource(int2, v_aeIndex, v_updateRequest);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
f_sleep(5.0);
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_subscriptionIndex), f_getOriginator(v_aeIndex)));
f_send(e_mcaPort, m_request(valueof(v_retrieveRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value vc_response {
tc_ac.stop;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo)) {
if((vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].requestsSent == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].responsesReceived == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].notificationEventCount == 1 )) {
setverdict(pass, __SCOPE__ & ": INFO: notifications recorded correctly");
}
else{
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded properly");
}
} else {
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // end f_CSE_SUB_NTF_x15
/** @desc Check that the IUT stops recording notification statistics in the notificationStatsInfo attribute of the crossResourceSubscription resource if the notificationStatsEnable attribute of the crossResourceSubscription UPDATE request is set to FALSE and keeps the current value of the notificationStatsInfo
*
*/
testcase TC_CSE_SUB_NTF_x16() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_SUB_NTF_x16());
v_ae1.done;
}
function f_CSE_SUB_NTF_x16() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_ae2Index := -1;
var integer v_acpIndex := -1;
var integer v_subscriptionIndex := -1;
var template RequestPrimitive v_createRequest, v_retrieveRequest;
var template PrimitiveContent v_retrieveContentResponse;
var template RequestPrimitive v_updateRequestAe := m_updateAeBase;
var template RequestPrimitive v_updateRequest := m_updateCrossResourceSubscriptionBase;
var template RequestPrimitive v_createSubscriptionRequest := m_createSubscriptionBase;
v_retrieveContentResponse.subscription := mw_contentSubscriptionBase;
v_createSubscriptionRequest.primitiveContent.subscription.notificationStatsEnable:= true;
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
f_cse_preamble_subscriptionVerification(v_ae2Index, v_createSubscriptionRequest, int23);
v_subscriptionIndex := f_cse_createResource(int23, v_createSubscriptionRequest, v_aeIndex);//Parent
//Update of the target resource
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest.primitiveContent.aE.labels := {"VALUE_1"};
f_cse_updateResource(int2, v_aeIndex, v_updateRequest);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Update subscription notificationStatsEnable to False
v_updateRequest.primitiveContent.subscription.notificationStatsEnable := false;
f_cse_updateResource(int23, v_subscriptionIndex, v_updateRequest);
//Second update of the target resource
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
v_updateRequest.primitiveContent.aE.labels := {"VALUE_1"};
f_cse_updateResource(int2, v_aeIndex, v_updateRequest);
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
f_sleep(5.0);
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_subscriptionIndex), f_getOriginator(v_aeIndex)));
f_send(e_mcaPort, m_request(valueof(v_retrieveRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retrieveContentResponse))) -> value vc_response {
tc_ac.stop;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo)) {
if((vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].requestsSent == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].responsesReceived == 1 ) and
(vc_response.primitive.responsePrimitive.primitiveContent.subscription.notificationStatsInfo.notificationStats_list[0].notificationEventCount == 1 )) {
setverdict(pass, __SCOPE__ & ": INFO: notifications recorded correctly");
}
else{
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded properly");
}
} else {
setverdict(fail, __SCOPE__ & ": ERROR: Notifications not recorded");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // end f_CSE_SUB_NTF_x16
}//end group Notify
group Update {
}//end group Update
group Delete {
}//end group Delete
}//end group Subscription_And_Notification
group Security {
group authentication {
group ESPrim {
group Notify{
}//end group Notify
}//end group ESPrim
group Role_Based_Access_Control { // TODO To be moved to authorization group
group Create{
}//end group Create
group Retrieve {
}// end of group Retrieve
group Update {
}//end group Update
group Notify {
}//end group Notify
}//end group Role_Based_Access_Control
group ESCertKE {
group Notify {
}// end of group Notify
}// end of group ESCertKE
group Access_Control_Policy { // TODO To be moved to authorization group
group Create{
}//end group Create
group Retrieve {
/**
* @desc Check that the IUT successfully returns the privileges of the ORIGINATOR on the TARGET_RESOURCE_ADDRESS when the RETRIEVE request contains Result Content set to permissions
*
*/
testcase TC_CSE_SEC_ACP_RET_001() runs on Tester system CseSystem {
var AeSimu v_ae := AeSimu.create("AE1") alive;
v_ae.start(f_CSE_SEC_ACP_RET_001());
v_ae.done;
}
function f_CSE_SEC_ACP_RET_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var RequestPrimitive v_createRequestAcp := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_retrieveRequest;
var AccessControlRule v_accessControlRule;
var PrimitiveContent v_primitiveContentRetrievedResource;
// Test control
// Test component configuration
f_cf01Up();
// Test adapter configuration
// Preamble
v_acpIndex := f_cse_createResource(int1, v_createRequestAcp); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
v_accessControlRule := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, int59)); // c_CRDNDi
// TODO Check Content containing permissions ...
// pernissions only present is Token
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_aeIndex);
// Test Body
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_acpIndex), f_getOriginator(v_acpIndex)));
v_retrieveRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
v_retrieveRequest.resultContent := int12;
f_send(e_mcaPort, m_request(v_retrieveRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_primitiveContentRetrievedResource))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Successful Update operation on resource type int1 (Ae)");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while Update operation on resource type int2 (Ae)");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing update operation on resource type int2 (Ae)");
}
}
if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.aE)) {
if(not match (f_resourceIdCleaner(v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs[0]), v_retrieveRequest.primitiveContent.aE.accessControlPolicyIDs[0])){
setverdict(fail, __SCOPE__ & ": Error: Access Control policy ID attribute not updated correctly");
}
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
}//end TC_CSE_SEC_ACP_RET_001
/**
* @desc Check that the IUT rejects a RETRIEVE request from the AE containing Result Content set to permissions when AE has no RETRIEVE privileges on the selfPrivileges attribute of <accessControlPolicy> resources associated with the TARGET_RESOURCE_ADDRESS resource
*
*/
testcase TC_CSE_SEC_ACP_RET_002() runs on Tester system CseSystem {
var AeSimu v_ae := AeSimu.create("AE1") alive;
v_ae.start(f_CSE_SEC_ACP_RET_002());
v_ae.done;
}
......@@ -3413,7 +4818,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createRequest := valueof(m_createAcpBase);
var integer v_state := 0; // Sequencing of received message
var SignatureList v_authorSigns;
var template RequestPrimitive v_notifyRequest := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentCreateNotification({ uRI := "" }, omit, omit, omit));
var template RequestPrimitive v_notifyRequest := m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotificationEmpty);
// Test control
if(not(PICS_ACP_SUPPORT)) {
setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
......@@ -4473,7 +5878,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
var ListOfCoordinates v_location := {2.3514616, 48.8566969};
var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
 
// Test control
......@@ -4543,8 +5948,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
var ListOfCoordinates v_location := {-4.4216366, 36.7213028};
var ListOfCoordinates v_location_1 := {2.3514616, 48.8566969};
var ListOfCoordinates v_location := "[-4.4216366, 36.7213028]";
var ListOfCoordinates v_location_1 := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template (omit) ListOfURIs uRIList := {"NotInitialized"};
var MsgIn v_response;
......@@ -4622,7 +6027,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
var ListOfCoordinates v_location := {2.3514616, 48.8566969};
var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
var Labels v_labels := {"VALUE_1"};
var template (omit) ListOfURIs uRIList := {"NotInitialized"};
......@@ -4701,127 +6106,426 @@ module OneM2M_Testcases_CSE_Release_4 {
v_ae1.done;
}//end TC_CSE_DIS_034_CRE
testcase TC_CSE_DIS_034_UPD() runs on Tester system CseSystem { //Update
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DIS_034(v_updateRequest));
v_ae1.done;
}//end TC_CSE_DIS_034_UPD
testcase TC_CSE_DIS_034_UPD() runs on Tester system CseSystem { //Update
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DIS_034(v_updateRequest));
v_ae1.done;
}//end TC_CSE_DIS_034_UPD
testcase TC_CSE_DIS_034_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_034(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_DIS_034_DEL
}//end group g_CSE_DIS_034
group g_CSE_DIS_035 {
/**
* @desc Check that the IUT returns the empty content when resources match the geoQuery filter criteria but they do not include Discovery-based OPERATION permission.
*
*/
testcase TC_CSE_DIS_035_CRE() runs on Tester system CseSystem { //Create
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_035(m_createContainerBase));
v_ae1.done;
}//end TC_CSE_DIS_035_CRE
testcase TC_CSE_DIS_035_UPD() runs on Tester system CseSystem { //Update
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DIS_035(v_updateRequest));
v_ae1.done;
}//end TC_CSE_DIS_035_UPD
testcase TC_CSE_DIS_035_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_035(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_DIS_035_DEL
}//end group g_CSE_DIS_035
group g_CSE_DIS_036 {
/**
* @desc Check that the IUT accepts a Discovery-based OPERATION request to the resource TARGET_RESOURCE_ADDRESS when AE has no privilege to perform the discovery operation
*
*/
testcase TC_CSE_DIS_036_CRE() runs on Tester system CseSystem { //Create
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_036(m_createContainerBase));
v_ae1.done;
}//end TC_CSE_DIS_036_CRE
testcase TC_CSE_DIS_036_UPD() runs on Tester system CseSystem { //Update
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DIS_036(v_updateRequest));
v_ae1.done;
}//end TC_CSE_DIS_036_UPD
testcase TC_CSE_DIS_036_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_036(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_DIS_036_DEL
}//end group g_CSE_DIS_036
}//end group Basic_Operations
}//end group Discovery
group Primitive_Profile {
group TC_CSE_PP_001 {
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_CRE() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_CRE());
v_ae1.done;
}
function f_CSE_PP_001_CRE() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
// Link Primitive Prifle created to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile added to Create Container Request!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile not added to Create Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // f_CSE_PP_001_CRE
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_RET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_RET());
v_ae1.done;
}
function f_CSE_PP_001_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerParentIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute resultContent=4(attribute and child resource) for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected response as per Result Content=4 (attribute and child resource)
v_retriveContentResponse.container := mw_contentContainer_rc4;
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_containerParentIndex);
testcase TC_CSE_DIS_034_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
 
v_ae1.start(f_CSE_DIS_034(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_DIS_034_DEL
}//end group g_CSE_DIS_034
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": ResultContent from Primtive Profile added to Retrieve Request");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": ResultContent from Primtive Profile not added to Retrieve Request");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
 
group g_CSE_DIS_035 {
/**
* @desc Check that the IUT returns the empty content when resources match the geoQuery filter criteria but they do not include Discovery-based OPERATION permission.
*
*/
testcase TC_CSE_DIS_035_CRE() runs on Tester system CseSystem { //Create
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_035(m_createContainerBase));
v_ae1.done;
}//end TC_CSE_DIS_035_CRE
//Tear down
f_cf01Down();
} // f_CSE_PP_001_RET
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_DEL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_DEL());
v_ae1.done;
}
function f_CSE_PP_001_DEL() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_deleteContentResponse;
testcase TC_CSE_DIS_035_UPD() runs on Tester system CseSystem { //Update
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DIS_035(v_updateRequest));
v_ae1.done;
}//end TC_CSE_DIS_035_UPD
// Test component configuration
f_cf01Up();
testcase TC_CSE_DIS_035_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute resultContent=1 (attribute) for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
//Create Container resource
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Delete container resource with default resultContent (0-nothing)
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
v_deleteRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_deleteRequest));
tc_ac.start;
 
v_ae1.start(f_CSE_DIS_035(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_DIS_035_DEL
}//end group g_CSE_DIS_035
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": All attributes provided as per the resultContent in primtive profile");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong content provided when resultContent set to 1 in Primtive Profile");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
}
}
//Postamble
f_cse_postamble_deleteResources();
 
group g_CSE_DIS_036 {
/**
* @desc Check that the IUT accepts a Discovery-based OPERATION request to the resource TARGET_RESOURCE_ADDRESS when AE has no privilege to perform the discovery operation
*
*/
testcase TC_CSE_DIS_036_CRE() runs on Tester system CseSystem { //Create
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_036(m_createContainerBase));
v_ae1.done;
}//end TC_CSE_DIS_036_CRE
//Tear down
f_cf01Down();
} // f_CSE_PP_001_DEL
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_UPD() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_UPD());
v_ae1.done;
}
function f_CSE_PP_001_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_createdContainerResource := -1;
var MsgIn v_response;
testcase TC_CSE_DIS_036_UPD() runs on Tester system CseSystem { //Update
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DIS_036(v_updateRequest));
v_ae1.done;
}//end TC_CSE_DIS_036_UPD
// Test component configuration
f_cf01Up();
testcase TC_CSE_DIS_036_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Update container request with Primitive Profile ID, and not including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
 
v_ae1.start(f_CSE_DIS_036(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_DIS_036_DEL
}//end group g_CSE_DIS_036
}//end group Basic_Operations
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
}//end group Discovery
group Primitive_Profile {
group TC_CSE_PP_001 {
f_send(e_mcaPort, m_request(v_updateContainer));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile added correctly to Update Container Request!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile not added to Update Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Unexpected response status code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // f_CSE_PP_001_UPD
} // TC_CSE_PP_001
group TC_CSE_PP_002 {
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_CRE() runs on Tester system CseSystem {
testcase TC_CSE_PP_002_CRE() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_CRE());
v_ae1.start(f_CSE_PP_002_CRE());
v_ae1.done;
}
function f_CSE_PP_001_CRE() runs on AeSimu system CseSystem {
function f_CSE_PP_002_CRE() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_createdContainerResourceIndex := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Primitive Profile with primitive "maxByte" to be deleted
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Create container resource without "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
// Link Primitve Prifle created to this Request
//Create container resource with "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
// Link Primitive Prifle created to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
......@@ -4829,19 +6533,19 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile added to Create Container Request!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile not added to Create Container Request!");
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Delete maxByteSize primitive in PrimitiveProfile not applied to Container resource!");
} else {
setverdict(pass, __SCOPE__ & ": Delete maxByteSize primitive value in PrimitiveProfile applied correctly to Container resource!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
setverdict(fail, __SCOPE__ & ": Unexpected response status code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
setverdict(fail, __SCOPE__ & ": Error while creating resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -4853,22 +6557,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_001_CRE
} // f_CSE_PP_002_CRE
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_RET() runs on Tester system CseSystem {
testcase TC_CSE_PP_002_RET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_RET());
v_ae1.start(f_CSE_PP_002_RET());
v_ae1.done;
}
function f_CSE_PP_001_RET() runs on AeSimu system CseSystem {
function f_CSE_PP_002_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerParentIndex := -1;
......@@ -4876,25 +6581,29 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute resultContent=4(attribute and child resource) for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Primitive Profile with Delete atribute resultContent for container resource.
v_createPrimitiveProfile := m_createPrimitiveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected response as per Result Content=4 (attribute and child resource)
v_retriveContentResponse.container := mw_contentContainer_rc4;
// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
v_retriveContentResponse.container := mw_contentContainer_rc1;
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_containerParentIndex);
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Retrieve container with link to Primitve Profile
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
 
tc_ac.start;
......@@ -4925,22 +6634,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_001_RET
} // f_CSE_PP_002_RET
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_DEL() runs on Tester system CseSystem {
testcase TC_CSE_PP_002_DEL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_DEL());
v_ae1.start(f_CSE_PP_002_DEL());
v_ae1.done;
}
function f_CSE_PP_001_DEL() runs on AeSimu system CseSystem {
function f_CSE_PP_002_DEL() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
......@@ -4948,13 +6657,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_deleteContentResponse;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute resultContent=1 (attribute) for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Primitive Profile with delete atribute resultContent of content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
......@@ -4970,17 +6682,14 @@ module OneM2M_Testcases_CSE_Release_4 {
tc_ac.start;
 
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
// If primitive profile awas applied, the default value of resultContent(0=nothing) will be applied
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": All attributes provided as per the resultContent in primtive profile");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong content provided when resultContent set to 1 in Primtive Profile");
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -4996,65 +6705,66 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_001_DEL
} // f_CSE_PP_002_DEL
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by adding the applicable parameters/attributes when the request message contains a valid Primitive Profile Identifier parameter and the referenced profile is accessible to the Hosting CSE.
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_001_UPD() runs on Tester system CseSystem {
testcase TC_CSE_PP_002_UPD() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_001_UPD());
v_ae1.start(f_CSE_PP_002_UPD());
v_ae1.done;
}
function f_CSE_PP_001_UPD() runs on AeSimu system CseSystem {
function f_CSE_PP_002_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var RequestPrimitive v_updateContainer;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerUpdate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_createdContainerResource := -1;
var integer v_createdContainerResourceIndex := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
// Primitive Profile with primitive "maxByte" to be deleted
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Update container request with Primitive Profile ID, and not including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
// Link Primitve Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
//Create container resource without Primtive Profile ID and maxByte=100
v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerMaxByte(100), v_aeIndex);
f_send(e_mcaPort, m_request(v_updateContainer));
//Update container resource with "maxByte" primitive - nothing to update as it is same as exising resource
v_requestContainerUpdate := f_getCreateRequestPrimitive(int3, m_updateContainerMaxByte(100), v_aeIndex);
// Link Primitive Prifle created to this Request
v_requestContainerUpdate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerUpdate));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile added correctly to Update Container Request!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile not added to Update Container Request!");
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Delete of maxByteSize primitive in PrimitiveProfile not applied to Container resource!");
} else {
setverdict(pass, __SCOPE__ & ": Delete of maxByteSize primitive value in PrimitiveProfile applied correctly to Container resource!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Unexpected response status code from IUT!");
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource");
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -5066,46 +6776,46 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_001_UPD
} // TC_CSE_PP_001
group TC_CSE_PP_002 {
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
} // f_CSE_PP_002_CRE
} // TC_CSE_PP_002
group TC_CSE_PP_003 {
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by replacing the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_002_CRE() runs on Tester system CseSystem {
testcase TC_CSE_PP_003_CRE() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_002_CRE());
v_ae1.start(f_CSE_PP_003_CRE());
v_ae1.done;
}
function f_CSE_PP_002_CRE() runs on AeSimu system CseSystem {
function f_CSE_PP_003_CRE() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_createdContainerResourceIndex := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with primitve "maxByte" to be deleted
v_createPrimitveProfile := m_createPrimitveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
// Link Primitve Prifle created to this Request
//Create container resource with "maxByte"=1000 primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
// Link Primitive Prifle created to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
......@@ -5113,19 +6823,19 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Delete maxByteSize primitive in PrimitveProfile not applied to Container resource!");
} else {
setverdict(pass, __SCOPE__ & ": Delete maxByteSize primitive value in PrimitveProfile applied correctly to Container resource!");
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in Create Container Request modified to the value in Primitive Profile!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in Create Container Request not modified to the value in Primitive Profile!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Unexpected response status code from IUT!");
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating resource");
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -5137,22 +6847,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_002_CRE
} // f_CSE_PP_003_CRE
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by modifying the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_002_RET() runs on Tester system CseSystem {
testcase TC_CSE_PP_003_RET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_002_RET());
v_ae1.start(f_CSE_PP_003_RET());
v_ae1.done;
}
function f_CSE_PP_002_RET() runs on AeSimu system CseSystem {
function f_CSE_PP_003_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
......@@ -5161,16 +6871,19 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Delete atribute resultContent for container resource.
v_createPrimitveProfile := m_createPrimitveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Primitive Profile with Add atribute resultContent for container resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
v_retriveContentResponse.container := mw_contentContainer_rc1;
v_retriveContentResponse.container := mw_contentContainer_rc4;
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -5178,16 +6891,18 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Retrieve container with link to Primitve Profile
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_requestContainerCreate.resultContent := int1; // only attriubutes
f_send(e_mcaPort, m_request(v_retrieveRequest));
 
tc_ac.start;
alt {
// Expect response as per resultContent=4, specified in Primitive Profile
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": ResultContent from Primtive Profile added to Retrieve Request");
setverdict(pass, __SCOPE__ & ": ResultContent(4) from Primtive Profile added to Retrieve Request");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
......@@ -5211,60 +6926,72 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_002_RET
} // f_CSE_PP_003_RET
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by modifying the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_002_DEL() runs on Tester system CseSystem {
testcase TC_CSE_PP_003_DEL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_002_DEL());
v_ae1.start(f_CSE_PP_003_DEL());
v_ae1.done;
}
function f_CSE_PP_002_DEL() runs on AeSimu system CseSystem {
function f_CSE_PP_003_DEL() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_deleteContentResponse;
var integer v_containerParentIndex := -1;
// Test component configuration
f_cf01Up();
// Preambleo
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with delete atribute resultContent of content resource.
v_createPrimitveProfile := m_createPrimitveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Primitive Profile with Add atribute resultContent=1 for container resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
//Create Container resource
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Delete container resource with default resultContent (0-nothing)
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Delete container resource with resultContent (4-attributes and child resource)
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_deleteRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_deleteRequest.resultContent := int4;
f_send(e_mcaPort, m_request(v_deleteRequest));
tc_ac.start;
 
alt {
// If primitive profile awas applied, the default value of resultContent(0=nothing) will be applied
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response {
// If primitive profile awas applied, value of resultContent(1=attribte) will be applied
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": All attributes provided as per the resultContent in primtive profile");
setverdict(pass, __SCOPE__ & ": Only attributes of parent provided as per the resultContent in primtive profile");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong content provided when resultContent set to 1 in Primtive Profile");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
......@@ -5279,63 +7006,68 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_002_DEL
} // f_CSE_PP_003_DEL
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by deleting the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by modifying the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
*
*/
testcase TC_CSE_PP_002_UPD() runs on Tester system CseSystem {
testcase TC_CSE_PP_003_UPD() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_002_UPD());
v_ae1.start(f_CSE_PP_003_UPD());
v_ae1.done;
}
function f_CSE_PP_002_UPD() runs on AeSimu system CseSystem {
function f_CSE_PP_003_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var RequestPrimitive v_requestContainerUpdate;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_createdContainerResourceIndex := -1;
var integer v_createdContainerResource := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with primitve "maxByte" to be deleted
v_createPrimitveProfile := m_createPrimitveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and maxByte=100
v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerMaxByte(100), v_aeIndex);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Update container resource with "maxByte" primitive - nothing to update as it is same as exising resource
v_requestContainerUpdate := f_getCreateRequestPrimitive(int3, m_updateContainerMaxByte(100), v_aeIndex);
// Link Primitve Prifle created to this Request
v_requestContainerUpdate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
//Create container resource with maxByte=1000 attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
//Update container request with maxByte=2000 and link to Primitive Profile
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerUpdate));
f_send(e_mcaPort, m_request(v_updateContainer));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Delete of maxByteSize primitive in PrimitveProfile not applied to Container resource!");
} else {
setverdict(pass, __SCOPE__ & ": Delete of maxByteSize primitive value in PrimitveProfile applied correctly to Container resource!");
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile is updated correctly to Update Container Request!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile is not updated to Update Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
setverdict(fail, __SCOPE__ & ": Wrong status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
setverdict(fail, __SCOPE__ & ": Error while updating resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -5347,63 +7079,72 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_002_CRE
} // TC_CSE_PP_002
group TC_CSE_PP_003 {
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by replacing the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
} // f_CSE_PP_003_UPD
} // TC_CSE_PP_003
group TC_CSE_PP_004 {
/**
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter is not present.
*
*/
testcase TC_CSE_PP_003_CRE() runs on Tester system CseSystem {
testcase TC_CSE_PP_004_CRE() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_003_CRE());
v_ae1.start(f_CSE_PP_004_CRE());
v_ae1.done;
}
function f_CSE_PP_003_CRE() runs on AeSimu system CseSystem {
function f_CSE_PP_004_CRE() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Create container resource with "maxByte"=1000 primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
// Link Primitve Prifle created to this Request
//Create container resource without "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
// Link Primitive Prifle, which was deleted, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
tc_ac.stop;
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in Create Container Request modified to the value in Primitive Profile!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in Create Container Request not modified to the value in Primitive Profile!");
}
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
// Commented out utnil TP is frozen - reject or accept.
/*
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Create Container Request!");
} else {
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Create Container Request!");
} */
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -5415,22 +7156,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_003_CRE
} // f_CSE_PP_004_CRE
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by modifying the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter is not present.
*
*/
testcase TC_CSE_PP_003_RET() runs on Tester system CseSystem {
testcase TC_CSE_PP_004_RET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_003_RET());
v_ae1.start(f_CSE_PP_004_RET());
v_ae1.done;
}
function f_CSE_PP_003_RET() runs on AeSimu system CseSystem {
function f_CSE_PP_004_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
......@@ -5439,16 +7180,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent for container resource.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
v_retriveContentResponse.container := mw_contentContainer_rc4;
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -5456,33 +7197,43 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Retrieve container with link to Primitve Profile
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_requestContainerCreate.resultContent := int1; // only attriubutes
// Set expected container of retrieve request as per Result Content=1, as the Primtive Prfile is not accessible
v_retriveContentResponse.container := mw_contentContainer_rc1;
f_send(e_mcaPort, m_request(v_retrieveRequest));
tc_ac.start;
alt {
// Commenting out until TP is frozen
// Expect response as per resultContent=4, specified in Primitive Profile
/*
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": ResultContent(4) from Primtive Profile added to Retrieve Request");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_retriveContentResponse))) -> value v_response {
setverdict(pass, __SCOPE__ & ": ResultContent from Primtive Profile added to Retrieve Request");
} */
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": ResultContent from Primtive Profile not added to Retrieve Request");
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
}
}
......@@ -5491,75 +7242,73 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_003_RET
} // f_CSE_PP_004_RET
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by modifying the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter is not present.
*
*/
testcase TC_CSE_PP_003_DEL() runs on Tester system CseSystem {
testcase TC_CSE_PP_004_DEL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_003_DEL());
v_ae1.start(f_CSE_PP_004_DEL());
v_ae1.done;
}
function f_CSE_PP_003_DEL() runs on AeSimu system CseSystem {
function f_CSE_PP_004_DEL() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_deleteContentResponse;
var integer v_containerParentIndex := -1;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent=1 for container resource.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Delete container resource with resultContent (4-attributes and child resource)
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
//Delete container resource with default resultContent (0-nothing)
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
v_deleteRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_deleteRequest.resultContent := int4;
f_send(e_mcaPort, m_request(v_deleteRequest));
tc_ac.start;
 
alt {
// If primitive profile awas applied, value of resultContent(1=attribte) will be applied
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
/*
// If primitive profile awas ignored, value of resultContent(0=nothing) will be applied
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Only attributes of parent provided as per the resultContent in primtive profile");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_deleteContentResponse))) -> value v_response {
setverdict(pass, __SCOPE__ & ": Primitive Profile ignored as it is not accessible/does not exist");
}*/
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong content provided when resultContent set to 1 in Primtive Profile");
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while deleting resource");
setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
}
}
......@@ -5568,22 +7317,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_003_DEL
} // f_CSE_PP_004_DEL
/**
* @desc Check that IUT applies the referenced <primitiveProfile> over the request messages by modifying the applicable parameters/attributes when the request message contains a valid PrimitiveProfileIdentifier parameter and the referenced profile is accessible to the Hosting CSE.
/**
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter in the request is not present.
*
*/
testcase TC_CSE_PP_003_UPD() runs on Tester system CseSystem {
testcase TC_CSE_PP_004_UPD() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_003_UPD());
v_ae1.start(f_CSE_PP_004_UPD());
v_ae1.done;
}
function f_CSE_PP_003_UPD() runs on AeSimu system CseSystem {
function f_CSE_PP_004_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -5591,42 +7341,54 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Create container resource with maxByte=1000 attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Update container request with maxByte=2000 and link to Primitive Profile
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
//Update container request with Primitive Profile ID, and not including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
 
// Link Primitve Prifle created to this Request
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
tc_ac.start;
alt {
/* commented out until TP is frozen-reject/accept
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile is updated correctly to Update Container Request!");
} else {
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile is not updated to Update Container Request!");
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Update Container Request!");
} else {
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Update Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
} */
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong status response code from IUT!");
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource");
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -5638,61 +7400,55 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_003_UPD
} // TC_CSE_PP_003
group TC_CSE_PP_004 {
} // f_CSE_PP_004_UPD
} //end group TC_CSE_PP_004
group TC_CSE_PP_005 {
/**
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter is not present.
* @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
*
*/
testcase TC_CSE_PP_004_CRE() runs on Tester system CseSystem {
testcase TC_CSE_PP_005_CRE() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_004_CRE());
v_ae1.start(f_CSE_PP_005_CRE());
v_ae1.done;
}
function f_CSE_PP_004_CRE() runs on AeSimu system CseSystem {
function f_CSE_PP_005_CRE() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
// Preambleo
f_cse_createAccessControlPolicyAux(-, -, int63);
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
 
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Create container resource without "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
// Link Primitve Prifle, which was deleted, to this Request
// Link Primitive Prifle, which was created, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
// Commented out utnil TP is frozen - reject or accept.
/*
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied to Create Container Request!");
} else {
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Create Container Request!");
} */
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -5712,22 +7468,22 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_004_CRE
} // f_CSE_PP_005_CRE
/**
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter is not present.
* @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
*
*/
testcase TC_CSE_PP_004_RET() runs on Tester system CseSystem {
testcase TC_CSE_PP_005_RET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_004_RET());
v_ae1.start(f_CSE_PP_005_RET());
v_ae1.done;
}
function f_CSE_PP_004_RET() runs on AeSimu system CseSystem {
function f_CSE_PP_005_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
......@@ -5736,13 +7492,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
// Preambleo
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent for container resource.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -5750,17 +7509,13 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Retrieve container with link to Primitve Profile
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_requestContainerCreate.resultContent := int1; // only attriubutes
// Set expected container of retrieve request as per Result Content=1, as the Primtive Prfile is not accessible
v_retriveContentResponse.container := mw_contentContainer_rc1;
//v_retriveContentResponse.container := mw_contentContainer_rc1;
f_send(e_mcaPort, m_request(v_retrieveRequest));
tc_ac.start;
......@@ -5773,10 +7528,13 @@ module OneM2M_Testcases_CSE_Release_4 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": ResultContent from Primtive Profile added to Retrieve Request");
} */
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
......@@ -5795,38 +7553,38 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_004_RET
} // f_CSE_PP_005_RET
/**
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter is not present.
* @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
*
*/
testcase TC_CSE_PP_004_DEL() runs on Tester system CseSystem {
testcase TC_CSE_PP_005_DEL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_004_DEL());
v_ae1.start(f_CSE_PP_005_DEL());
v_ae1.done;
}
function f_CSE_PP_004_DEL() runs on AeSimu system CseSystem {
function f_CSE_PP_005_DEL() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
// Preambleo
f_cse_createAccessControlPolicyAux(-, -, int63);
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent=1 for container resource.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create Container resource
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -5845,9 +7603,10 @@ module OneM2M_Testcases_CSE_Release_4 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Primitive Profile ignored as it is not accessible/does not exist");
}*/
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -5867,23 +7626,23 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_004_DEL
} // f_CSE_PP_005_DEL
/**
* @desc Check that the IUT rejects the request when the <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter in the request is not present.
* @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
*
*/
testcase TC_CSE_PP_004_UPD() runs on Tester system CseSystem {
testcase TC_CSE_PP_005_UPD() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_004_UPD());
v_ae1.start(f_CSE_PP_005_UPD());
v_ae1.done;
}
function f_CSE_PP_004_UPD() runs on AeSimu system CseSystem {
function f_CSE_PP_005_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -5891,16 +7650,17 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -5908,7 +7668,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and not including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
 
// Link Primitve Prifle created to this Request
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
......@@ -5918,16 +7678,17 @@ module OneM2M_Testcases_CSE_Release_4 {
/* commented out until TP is frozen-reject/accept
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied to Update Container Request!");
setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Update Container Request!");
} else {
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Update Container Request!");
setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Update Container Request!");
}
} */
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected the create request with non existing primtive profile!");
setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -5947,8 +7708,10 @@ module OneM2M_Testcases_CSE_Release_4 {
 
//Tear down
f_cf01Down();
} // f_CSE_PP_004_UPD
} //end group TC_CSE_PP_004
} // f_CSE_PP_005_UPD
} //end group TC_CSE_PP_005
group TC_CSE_PP_006 {
......@@ -5965,19 +7728,22 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_CRE() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP with link to Primitive Profile created
v_request := valueof(m_createAcp(omit, -, int63));
......@@ -6023,25 +7789,28 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_retrieveRequest;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP with link to Primitive Profile created
v_acpResourceIndex := f_cse_createResource(int1, m_createAcpBase, v_aeIndex);
//Retrieve ACP resource with link to Primitve Profile
//Retrieve ACP resource with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_acpResourceIndex), f_getOriginator(v_acpResourceIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
......@@ -6084,20 +7853,23 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_DEL() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP
v_acpResourceIndex := f_cse_createResource(int1, m_createAcpBase, v_aeIndex);
......@@ -6146,20 +7918,23 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updateAcpRequest;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP resource
......@@ -6169,7 +7944,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_updateAcpRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, m_updateAcpBase);
v_updateAcpRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
 
// Link Primitve Prifle created to non matching Primitive Profile
// Link Primitive Prifle created to non matching Primitive Profile
v_updateAcpRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateAcpRequest));
......@@ -6200,6 +7975,126 @@ module OneM2M_Testcases_CSE_Release_4 {
} // f_CSE_PP_006_UPD
}//end group TC_CSE_PP_006
 
/**
* @desc Check that the IUT rejects the creation of <primitiveProfile> resource request when the request parameters or resource attributes defined in the additions and deletions attributes of the referenced <primitiveProfile> resource are not valid
*
*/
testcase TC_CSE_PP_007() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_007());
v_ae1.done;
}
function f_CSE_PP_007() runs on AeSimu system CseSystem {
// Local variables
var RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updateAcpRequest;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile With Invalid Additions Or Deletions attribute
v_createPrimitiveProfile := valueof(m_createPrimitiveProfileWithInvalidAdditionsOrDeletions({f_getOriginator(v_aeIndex)}));
f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4137))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with PRIMITIVE_PROFILE_BAD REQUEST");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with invalid parametres/attributes in additions/deletions!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // f_CSE_PP_007
/**
* @desc Check that the IUT rejects the update request of <primitiveProfile> resource when the request parameters or resource attributes defined in the additions and deletions attributes of the referenced <primitiveProfile> resource are not valid
*
*/
testcase TC_CSE_PP_008() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_PP_008());
v_ae1.done;
}
function f_CSE_PP_008() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updatePrimitiveProfileRequest;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileWithInvalidAdditionsOrDeletions);
f_send(e_mcaPort, m_request(v_updatePrimitiveProfileRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4137))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with PRIMITIVE_PROFILE_BAD REQUEST");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with invalid parametres/attributes in additions/deletions!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
}
}
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
} // f_CSE_PP_008
/**
* @desc Check that the IUT rejects the creation of a <primitiveProfile> resource when a mutual exclusivity check is failed, on the names of the attributes or parameters specified in the additions and deletions attributes.
*
......@@ -6213,26 +8108,29 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_009() runs on AeSimu system CseSystem {
// Local variables
var RequestPrimitive v_createPrimitveProfile;
var RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be added and deleted simultaneously.
v_createPrimitveProfile := valueof(m_createPrimitveProfileAddNonMutuallyExclusive({f_getOriginator(v_aeIndex)}));
v_createPrimitiveProfile := valueof(m_createPrimitiveProfileAddNonMutuallyExclusive({f_getOriginator(v_aeIndex)}));
f_send(e_mcaPort, m_request(v_createPrimitveProfile));
f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with attributes that are not mutually exclusive!");
setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with attributes that are not mutually exclusive!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -6240,7 +8138,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes that are not mutually exclusive!");
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes that are not mutually exclusive!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -6267,19 +8165,22 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_010() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updatePrimitiveProfileRequest;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileNonMutuallyExclusive);
......@@ -6288,7 +8189,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with attributes that are not mutually exclusive!");
setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with attributes that are not mutually exclusive!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -6296,7 +8197,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes that are not mutually exclusive!");
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes that are not mutually exclusive!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -6323,7 +8224,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_011() runs on AeSimu system CseSystem {
// Local variables
var RequestPrimitive v_createPrimitveProfile;
var RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -6332,19 +8233,22 @@ module OneM2M_Testcases_CSE_Release_4 {
var MsgIn v_response;
var RequestPrimitive v_updateAcpRequest;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile for adding non permissible parameters.
v_createPrimitveProfile := valueof(m_createPrimitveProfileAddNonPermissibleAttribute({f_getOriginator(v_aeIndex)}));
v_createPrimitiveProfile := valueof(m_createPrimitiveProfileAddNonPermissibleAttribute({f_getOriginator(v_aeIndex)}));
f_send(e_mcaPort, m_request(v_createPrimitveProfile));
f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with non permissible parameters!");
setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with non permissible parameters!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -6352,7 +8256,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with non permissible parameters!");
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with non permissible parameters!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -6379,19 +8283,22 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_012() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updatePrimitiveProfileRequest;
// Preambleo
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileNonPermissibleParameters);
......@@ -6400,7 +8307,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with non permissible parameters!");
setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with non permissible parameters!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -6408,7 +8315,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with non permissible parameters!");
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with non permissible parameters!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -6443,7 +8350,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
// Test control
if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
......@@ -6451,15 +8358,16 @@ module OneM2M_Testcases_CSE_Release_4 {
stop;
}
// Test component configuration
f_cf01Up();
// AE registration
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Container create with response type as nonBlockingRequestAsynch
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
......@@ -6571,7 +8479,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var OneM2M_Types.URI v_requestResourceURI;
var template PrimitiveContent v_primitiveContent;
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
// Test control
if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
......@@ -6592,8 +8500,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Create resource with responseType as nonBlockingRequestSynch
v_createContainerRequest.to_ := f_getResourceAddress(v_aeIndex);
......@@ -6644,7 +8552,7 @@ module OneM2M_Testcases_CSE_Release_4 {
tc_ac.stop;
if (valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.responseStatusCode) == int2001){
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
......@@ -6708,7 +8616,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentNotification := {container := mw_contentContainerWithoutMaxByteSize};// container without MaxByteSize
var RequestPrimitive v_request;
var integer v_ae2Index := -1;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
// Test control
 
......@@ -6721,8 +8629,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Subscription resource with notification to AE2 about container creation
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
......@@ -6784,13 +8692,14 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_CRE() runs on CseSimu system CseSystem {
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
var XSD.ID v_targetResourceAddress;
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
// Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
......@@ -6803,8 +8712,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
//Create Primitive Profile from AE1 to add MaxByte Primtive to container resource creation
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
//Create container resource from AE1 with To as ID of remoteCSE
......@@ -6863,7 +8772,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_RET() runs on CseSimu system CseSystem {
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
......@@ -6872,6 +8781,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
var RequestPrimitive v_retrieveRequest;
// Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
......@@ -6884,15 +8794,15 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
//Create Primitive Profile from AE1, to add primtive resultContent=4 for container resource retrieval
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
// Create local container resource at Hosting CSE
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainerBase)), vc_cSEBaseIndex, int3);
v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
//Retrieve the container resource from AE1, without any resultContent but with link to Primitve Profile created by AE1
//Retrieve the container resource from AE1, without any resultContent but with link to Primitive Profile created by AE1
v_retrieveRequest := valueof(m_retrieve(v_targetResourceAddress, f_getResourceAddress(v_aeIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
vc_ae1.start(f_cse_operationResource(v_retrieveRequest));
......@@ -6945,7 +8855,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_DEL() runs on CseSimu system CseSystem {
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
......@@ -6954,6 +8864,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_deleteRequest;
var integer v_targetResourceIndex := -1;
// Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
......@@ -6966,8 +8877,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
 
// Primitive Profile with Add atribute resultContent=4 for container resource delete request.
v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
// Create local container resource at Hosting CSE
......@@ -7029,7 +8940,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_UPD() runs on CseSimu system CseSystem {
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
......@@ -7037,6 +8948,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var XSD.ID v_targetResourceAddress;
var template RequestPrimitive v_updateContainer := m_updateContainerBase;
// Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
......@@ -7049,8 +8961,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
//Create Primitive Profile from AE1, to add MaByte primitive to create container request
v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
// Create Local container resource in Hosting CSE
......@@ -7124,8 +9036,9 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7133,8 +9046,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without "maxByte" primitive, but with link to Primitive Profile created
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
......@@ -7145,7 +9058,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
......@@ -7193,10 +9106,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_primitiveProfileIndex := -1;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var template PrimitiveContent v_deleteContentResponse;
var RequestPrimitive v_deleteRequest;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7204,8 +9118,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response as per resultContent=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
......@@ -7223,7 +9137,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
......@@ -7276,10 +9190,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_containerIndex := -1;
var integer v_aeIndex := -1;
var RequestPrimitive v_requestContainerCreate;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7287,8 +9202,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response
v_retriveContentResponse.container := mw_contentContainerBase;
......@@ -7296,7 +9211,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create container resource without "maxByte" primitive
v_containerIndex := f_cse_createResource(int62, m_createContainerBase, v_aeIndex);
//Retrieve container with link to Primitve Profile
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
......@@ -7305,7 +9220,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
......@@ -7354,7 +9269,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_017_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -7362,13 +9277,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -7376,7 +9294,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and without including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_createContainerBase);
 
// Link Primitve Prifle created to this Request
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
......@@ -7384,7 +9302,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
......@@ -7438,8 +9356,9 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7448,12 +9367,12 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
// Link Primitve Prifle, which was deleted, to this Request
// Link Primitive Prifle, which was deleted, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_request));
......@@ -7461,7 +9380,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Primitive Profile not applied to response primtive!");
} else {
......@@ -7505,10 +9424,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_primitiveProfileIndex := -1;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var template PrimitiveContent v_deleteContentResponse;
var RequestPrimitive v_deleteRequest;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7516,8 +9436,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response as per resultContent=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
......@@ -7535,7 +9455,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": IUT did not apply primtive profile to the response primtive!");
} else {
......@@ -7575,7 +9495,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_018_RET() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -7585,13 +9505,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_retriveContentResponse;
var RequestPrimitive v_retrieveRequest;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response
v_retriveContentResponse.container := mw_contentContainerBase;
......@@ -7599,7 +9522,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create container resource with maxByte attribte
v_createdContainerResourceIndex := f_cse_createResource(int3, m_updateContainerMaxByte(100), v_aeIndex);
 
//Retrieve container with link to Primitve Profile
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_createdContainerResourceIndex), f_getOriginator(v_createdContainerResourceIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
......@@ -7608,7 +9531,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Primitive Profile not applied to response primtive!");
} else {
......@@ -7648,7 +9571,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_018_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -7656,13 +9579,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
......@@ -7670,7 +9596,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(100));
 
// Link Primitve Prifle created to this Request
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
......@@ -7678,7 +9604,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Primitive Profile to delete a primitive not applied to response!!");
} else {
......@@ -7729,8 +9655,9 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7738,12 +9665,12 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with "maxByte"=1000
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
// Link Primitve Prifle, which was deleted, to this Request
// Link Primitive Prifle, which was deleted, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_request));
......@@ -7751,7 +9678,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
......@@ -7795,9 +9722,10 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_containerIndex := -1;
var template PrimitiveContent v_contentResponse;
var template PrimitiveContent v_deleteContentResponse;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_deleteRequest;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7805,8 +9733,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response as per resultContent=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
......@@ -7824,7 +9752,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
......@@ -7864,10 +9792,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_primitiveProfileIndex := -1;
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var template PrimitiveContent v_retriveContentResponse;
var RequestPrimitive v_retrieveRequest;
// Test component configuration
f_cf01Up();
// AE registration
......@@ -7875,8 +9804,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response
v_retriveContentResponse.container := mw_contentContainerBase;
......@@ -7884,7 +9813,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create container resource with "maxByte"=1000
v_containerIndex := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
 
//Retrieve container with link to Primitve Profile
//Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
......@@ -7893,7 +9822,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
......@@ -7929,7 +9858,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_019_UPD() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createPrimitveProfile;
var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
......@@ -7937,13 +9866,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
// Test component configuration
f_cf01Up();
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
......@@ -7951,7 +9883,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and without including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
 
// Link Primitve Prifle created to this Request
// Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
......@@ -7959,7 +9891,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
// Check that IUT applied the Primitve Profile
// Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile to update a primitive applied to response!");
} else {
......@@ -8183,7 +10115,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes including complex data type definition");
setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes including complex data type definition");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
......@@ -8280,7 +10212,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
v_createPrimitiveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex); // TS-004 Table 6.3.4.2.1-1 -> primitiveProfile = 62
// Update Primitive Profile containing an invalid ADD_PARAMETER attribute
......@@ -12055,7 +13987,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, active ))){
if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, int1 ))){
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile does not has Status as ACTIVE in updated content.");
}
......@@ -12137,7 +14069,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, inactive ))){
if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, int2 ))){
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile does not has Status as INACTIVE in updated content.");
}
......@@ -14338,7 +16270,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createSoftwareCampaignRequest;
var integer v_aeIndex := -1;
var RequestPrimitive v_request;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
// Test component configuration
f_cf02Up();
......@@ -14349,8 +16281,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);// subject set as the parent resource
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTargets(valueof(v_actionGeneric));
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTargets({{valueof(v_actionGeneric)}});
 
v_request := f_getCreateRequestPrimitive(int61, v_createSoftwareCampaignRequest, v_aeIndex);
f_send(e_mcaPort, m_request(v_request));
......@@ -14394,7 +16326,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
// Test component configuration
f_cf02Up();
......@@ -14408,14 +16340,14 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);// subject set as the parent resource
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
v_resourceIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_resourceIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
// Software Campaign resource created with no accessible softwareTriggerCriteria
v_request := f_getCreateRequestPrimitive(int61, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14460,7 +16392,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createSoftwareCampaignRequest;
var integer v_aeIndex := -1;
var RequestPrimitive v_request;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
// Test component configuration
f_cf02Up();
......@@ -14468,11 +16400,11 @@ module OneM2M_Testcases_CSE_Release_4 {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi
 
v_actionGeneric.subjectResourceID := omit;// resource referenced in attribute softwareTriggerCriteria
v_actionGeneric.subjectResourceID := "resource_not_existing";// resource referenced in attribute softwareTriggerCriteria
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTriggerCriteria(-, valueof(v_actionGeneric));
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaignNoSoftwareTriggerCriteria(-, {{valueof(v_actionGeneric)}});
// Software Campaign resource created with no resource referenced in softwareTriggerCriteria attribute
v_request := f_getCreateRequestPrimitive(int61, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14522,7 +16454,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResourceType v_resourceType := int61;
 
var template Action_optional p_actionGeneric;
var template SoftwareTriggerCriterion p_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -14537,11 +16469,11 @@ module OneM2M_Testcases_CSE_Release_4 {
p_actionGeneric.subjectResourceID := f_getOriginator(v_resourceIndexContainer);
p_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
p_actionGeneric.evalCriteria.operator := int1;
p_actionGeneric.evalCriteria.threshold := 3;
p_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := p_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{p_actionGeneric}};
// Software Campaign resource created with no values on attribute softwareTriggerCriteria
v_createRequestPrimitive := f_getCreateRequestPrimitive(v_resourceType, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14588,7 +16520,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -14600,12 +16532,12 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
//IUT having valid <softwareCampaign> resource
v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14652,7 +16584,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -14663,11 +16595,11 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignStatus := int4; //CANCELLING acc. to TS-0004, Table 6.3.4.2.15 1: Interpretation of execStatusType
//IUT having valid <softwareCampaign> resource - containing campaignStatus attribute set to CANCELLING
......@@ -14717,7 +16649,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -14728,11 +16660,11 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{valueof(v_actionGeneric)}};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
//IUT having valid <softwareCampaign> resource - containing campaignEnabled attribute set to TRUE
......@@ -14784,7 +16716,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
var XSD.ID v_notaccessibleresource := "Invalid_ID";
 
// Test component configuration
......@@ -14796,12 +16728,12 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
//IUT having valid <softwareCampaign> resource - containing campaignEnabled attribute set to TRUE
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{valueof(v_actionGeneric)}};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14852,7 +16784,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex, v_resourceIndexNode := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -14866,11 +16798,11 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
//IUT having valid <softwareCampaign> resource
v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14922,7 +16854,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -14933,12 +16865,12 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.campaignEnabled := true;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
//IUT having valid <softwareCampaign> resource
v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
......@@ -14990,7 +16922,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -15001,18 +16933,18 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;//campaignEnabled attribute set to FALSE
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
//IUT having valid <softwareCampaign> resource
v_softwareCampaignResourceIndex := f_cse_createResource(v_resourceTypeSoftwareCampaign, v_createSoftwareCampaignRequest, v_aeIndex);
 
v_actionGeneric.subjectResourceID := "Invalid_URI";
v_updateSoftwareCampaign := m_updateSoftwareCampaign;
v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
v_updateRequest := valueof(v_updateSoftwareCampaign);
v_updateRequest := f_getUpdateRequestPrimitive(v_resourceTypeSoftwareCampaign, v_softwareCampaignResourceIndex, v_updateRequest);
......@@ -15058,7 +16990,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex, v_containerResourceIndex := -1;
var integer v_softwareCampaignResourceIndex := -1;
var ResourceType v_resourceTypeSoftwareCampaign := int61;
var template Action_optional v_actionGeneric;
var template SoftwareTriggerCriterion v_actionGeneric;
 
// Test component configuration
f_cf02Up();
......@@ -15070,11 +17002,11 @@ module OneM2M_Testcases_CSE_Release_4 {
v_actionGeneric.subjectResourceID := f_getOriginator(v_aeIndex);
v_actionGeneric.evalCriteria.subject := "tempContainer.content";//string example
v_actionGeneric.evalCriteria.operator := int1;
v_actionGeneric.evalCriteria.threshold := 3;
v_actionGeneric.evalCriteria.threshold := "3";
v_createSoftwareCampaignRequest := m_createSoftwareCampaign;//campaignEnabled attribute set to FALSE
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTargets := {f_getOriginator(v_aeIndex)};
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_createSoftwareCampaignRequest.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
 
//subject? resource at SUBJECT_RESOURCE_ADDRESS - TBD used container resource
v_containerResourceIndex := f_cse_createResource(int3, m_createContainerBase);
......@@ -15084,7 +17016,7 @@ module OneM2M_Testcases_CSE_Release_4 {
 
v_actionGeneric.subjectResourceID := f_getResourceAddress(v_containerResourceIndex); //SUBJECT_RESOURCE_ADDRESS
v_updateSoftwareCampaign := m_updateSoftwareCampaign;
v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := v_actionGeneric;
v_updateSoftwareCampaign.primitiveContent.softwareCampaign.softwareTriggerCriteria := {{v_actionGeneric}};
v_updateRequest := valueof(v_updateSoftwareCampaign);
v_updateRequest := f_getUpdateRequestPrimitive(v_resourceTypeSoftwareCampaign, v_softwareCampaignResourceIndex, v_updateRequest);
......@@ -15307,20 +17239,20 @@ module OneM2M_Testcases_CSE_Release_4 {
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
if(not match(c_transactionControl , vc_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
}
......@@ -15344,7 +17276,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Tear down
f_cf01Down();
return vc_response.primitive.responsePrimitive;
return v_response.primitive.responsePrimitive;
}//end f_CSE_TMG_CRE_001
......@@ -15485,20 +17417,20 @@ module OneM2M_Testcases_CSE_Release_4 {
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
if(not match(c_transactionControl , vc_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
}
......@@ -15522,7 +17454,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Tear down
f_cf01Down();
return vc_response.primitive.responsePrimitive;
return v_response.primitive.responsePrimitive;
}//end f_CSE_TMG_CRE_003
......@@ -15653,20 +17585,20 @@ module OneM2M_Testcases_CSE_Release_4 {
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
if(not match(c_transactionControl , vc_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
if(not match(c_transactionControl , v_response.primitive.responsePrimitive.primitiveContent.transactionMgmt.transactionControl)){
setverdict(fail, __SCOPE__ & ": Error, transactionControl is not set to INITIAL ");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
}
......@@ -15690,7 +17622,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Tear down
f_cf01Down();
return vc_response.primitive.responsePrimitive;
return v_response.primitive.responsePrimitive;
}//end f_CSE_TMG_CRE_005
......@@ -18014,7 +19946,7 @@ module OneM2M_Testcases_CSE_Release_4 {
vc_ae1.start(f_cse_updateResource(int20, v_serviceSubscribedNodeIndex, v_updateServiceSubscribedNode));
v_requestPrimitive := m_t8_request_delete(v_requestResourceURI,v_requestHeader , v_niddConfig); // NIDD configuration delete request
v_requestPrimitive := m_t8_request_delete(v_requestResourceURI,v_requestHeader , valueof(v_niddConfig)); // NIDD configuration delete request
tc_ac.start;
alt{
[] mcnPortIn.receive(mw_t8Request(v_requestPrimitive)) {
......@@ -18083,7 +20015,7 @@ module OneM2M_Testcases_CSE_Release_4 {
vc_ae1.start(f_cse_deleteResource(v_serviceSubscribedNodeIndex));
v_requestPrimitive := m_t8_request_delete(v_requestResourceURI, v_requestHeader, v_niddConfig); // NIDD configuration delete request
v_requestPrimitive := m_t8_request_delete(v_requestResourceURI, v_requestHeader, valueof(v_niddConfig)); // NIDD configuration delete request
tc_ac.start;
alt{
[] mcnPortIn.receive(mw_t8Request(v_requestPrimitive)) {
......@@ -18495,7 +20427,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test Body
//Scef send niddDownlink data delivery notification
v_requestPrimitiveNiddDownlinkDataDeliveryStatusNotification := m_t8_request_post(v_requestResourceURI, v_requestHeader, v_niddDLDataStatusNotificationBody); // NIDD Uplink data transfer request
v_requestPrimitiveNiddDownlinkDataDeliveryStatusNotification := m_t8_request_post(v_requestResourceURI, v_requestHeader, valueof(v_niddDLDataStatusNotificationBody)); // NIDD Uplink data transfer request
mcnPort.send(mw_t8Request(v_requestPrimitiveNiddDownlinkDataDeliveryStatusNotification));
tc_ac.start;
......@@ -18603,4 +20535,4 @@ module OneM2M_Testcases_CSE_Release_4 {
}//end group CSE
 
}
\ No newline at end of file
}