diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 03a6dc7b17f4f2dc5eae005b43c534bb7cd542af..85a8e7b0d138ab6d327af3573dfaae3a24384604 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -707,7 +707,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createContainerBaseInvalid modifies m_create := {
requestIdentifier := testcasename() & "-m_createContainer",
resourceType := int3,
- primitiveContent := {container_update_invalid := m_contentCreateContainerInvalid}
+ primitiveContent := {container_invalid := m_contentCreateContainerInvalid}
};
/**
@@ -1956,7 +1956,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_update_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
+ template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -3630,7 +3630,7 @@ module OneM2M_Templates {
choice := *//NP
};
- template (value) AE_update_invalid m_contentUpdateAe_invalid := {
+ template (value) AE_invalid m_contentUpdateAe_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3654,7 +3654,7 @@ module OneM2M_Templates {
choice := omit//O
};
- template (value) ACP_update_invalid m_contentUpdateAcp_invalid := {
+ template (value) AccessControlPolicy_invalid m_contentUpdateAcp_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3671,7 +3671,7 @@ module OneM2M_Templates {
choice := omit//O
};
- template (value) Group_update_invalid m_contentUpdateGroup_invalid := {
+ template (value) Group_invalid m_contentUpdateGroup_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3696,7 +3696,7 @@ module OneM2M_Templates {
choice := omit//O
};
- template (value) PollingChannel_update_invalid m_contentUpdatePollingChannel_invalid := {
+ template (value) PollingChannel_invalid m_contentUpdatePollingChannel_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3708,7 +3708,7 @@ module OneM2M_Templates {
expirationTime := omit//M
};
- template (value) Schedule_update_invalid m_contentUpdateSchedule_invalid := {
+ template (value) Schedule_invalid m_contentUpdateSchedule_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3724,7 +3724,7 @@ module OneM2M_Templates {
choice := omit//O
};
- template (value) Subscription_update_invalid m_contentUpdateSubscription_invalid := {
+ template (value) Subscription_invalid m_contentUpdateSubscription_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3753,7 +3753,7 @@ module OneM2M_Templates {
choice := omit//O
};
- template (value) Container_update_invalid m_contentUpdateContainer_invalid := {
+ template (value) Container_invalid m_contentUpdateContainer_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index b04051be2acf8ebe47550e5e4904ef33a9f6f898..b116f750797f31282fc746c89b96c671e6ea8cf9 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -1131,14 +1131,14 @@ module OneM2M_Types {
URI uRI,
DebugInfo debugInfo,
//Invalid types
- AE_update_invalid aE_update_invalid,
- ACP_update_invalid aCP_update_invalid,
- Container_update_invalid container_update_invalid,
- Group_update_invalid group_update_invalid,
- PollingChannel_update_invalid pollingChannel_update_invalid,
- Schedule_update_invalid schedule_update_invalid,
- Subscription_update_invalid subscription_update_invalid,
- LocationPolicy_update_invalid locationPolicy_update_invalid
+ AE_invalid aE_invalid,
+ AccessControlPolicy_invalid accessControlPolicy_invalid,
+ Container_invalid container_invalid,
+ Group_invalid group_invalid,
+ PollingChannel_invalid pollingChannel_invalid,
+ Schedule_invalid schedule_invalid,
+ Subscription_invalid subscription_invalid,
+ LocationPolicy_invalid locationPolicy_invalid
}
@@ -5310,7 +5310,7 @@ group optionalResourceTypes {
group invalidTypes {
- type record AE_update_invalid
+ type record AE_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5360,7 +5360,7 @@ group invalidTypes {
variant (choice.choice_list[-].group_) "name as 'group'";
};
- type record ACP_update_invalid {
+ type record AccessControlPolicy_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -5391,7 +5391,7 @@ group invalidTypes {
variant (choice.subscription_list[-]) "name as 'subscription'";
};
- type record Container_update_invalid {
+ type record Container_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5435,7 +5435,7 @@ group invalidTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record Group_update_invalid
+ type record Group_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5478,7 +5478,7 @@ group invalidTypes {
variant (choice.subscription_list[-]) "name as 'subscription'";
};
- type record PollingChannel_update_invalid
+ type record PollingChannel_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5496,7 +5496,7 @@ group invalidTypes {
variant (resourceName) "attribute";
};
- type record Schedule_update_invalid
+ type record Schedule_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5529,7 +5529,7 @@ group invalidTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record Subscription_update_invalid
+ type record Subscription_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5570,7 +5570,7 @@ group invalidTypes {
variant (choice) "untagged";
};
- type record LocationPolicy_update_invalid
+ type record LocationPolicy_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 76cf7449d251f1a1ebcfb1489630c61b345b2207..a0597f2667df817afadbfd29e25c59a4906ea08e 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -3844,7 +3844,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1;
+ v_createRequest.primitiveContent.container_invalid.maxNrOfInstances := -1;
v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -3859,7 +3859,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1;
+ v_createRequest.primitiveContent.container_invalid.maxByteSize := -1;
v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -3875,7 +3875,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1;
+ v_createRequest.primitiveContent.container_invalid.maxInstanceAge := -1;
v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -6149,8 +6149,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
- v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
+ v_updateRequest.primitiveContent := {container_invalid := m_contentUpdateContainer_invalid};
+ v_updateRequest.primitiveContent.container_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -6158,8 +6158,8 @@ module OneM2M_Testcases_CSE_Release_1 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.container_update_invalid)) {
- if(v_primitiveContentRetrieveResource.container_update_invalid.creationTime == v_creationTime){
+ if(ischosen(v_primitiveContentRetrieveResource.container_invalid)) {
+ if(v_primitiveContentRetrieveResource.container_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
@@ -6174,8 +6174,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
- v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
+ v_updateRequest.primitiveContent := {group_invalid := m_contentUpdateGroup_invalid};
+ v_updateRequest.primitiveContent.group_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest));//Group
v_ae1.done;
@@ -6183,8 +6183,8 @@ module OneM2M_Testcases_CSE_Release_1 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.group_update_invalid)) {
- if(v_primitiveContentRetrieveResource.group_update_invalid.creationTime == v_creationTime){
+ if(ischosen(v_primitiveContentRetrieveResource.group_invalid)) {
+ if(v_primitiveContentRetrieveResource.group_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
@@ -6199,8 +6199,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
- v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
+ v_updateRequest.primitiveContent := {accessControlPolicy_invalid := m_contentUpdateAcp_invalid};
+ v_updateRequest.primitiveContent.accessControlPolicy_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
v_ae1.done;
@@ -6208,8 +6208,8 @@ module OneM2M_Testcases_CSE_Release_1 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.aCP_update_invalid)) {
- if(v_primitiveContentRetrieveResource.aCP_update_invalid.creationTime == v_creationTime){
+ if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy_invalid)) {
+ if(v_primitiveContentRetrieveResource.accessControlPolicy_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
@@ -6224,8 +6224,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
- v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
+ v_updateRequest.primitiveContent := {subscription_invalid := m_contentUpdateSubscription_invalid};
+ v_updateRequest.primitiveContent.subscription_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -6233,8 +6233,8 @@ module OneM2M_Testcases_CSE_Release_1 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.subscription_update_invalid)) {
- if(v_primitiveContentRetrieveResource.subscription_update_invalid.creationTime == v_creationTime){
+ if(ischosen(v_primitiveContentRetrieveResource.subscription_invalid)) {
+ if(v_primitiveContentRetrieveResource.subscription_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
@@ -6345,9 +6345,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
+ v_updateRequest.primitiveContent := {container_invalid := m_contentUpdateContainer_invalid};
- v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter;
+ v_updateRequest.primitiveContent.container_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int3, v_createRequest, v_updateRequest));//Container
v_ae1.done;
@@ -6361,9 +6361,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
+ v_updateRequest.primitiveContent := {group_invalid := m_contentUpdateGroup_invalid};
- v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
+ v_updateRequest.primitiveContent.group_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int9, v_createRequest, v_updateRequest));//Group
v_ae1.done;
@@ -6377,9 +6377,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
+ v_updateRequest.primitiveContent := {accessControlPolicy_invalid := m_contentUpdateAcp_invalid};
- v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
+ v_updateRequest.primitiveContent.accessControlPolicy_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int1, v_createRequest, v_updateRequest));//AccessControlPolicy
v_ae1.done;
@@ -6393,9 +6393,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
+ v_updateRequest.primitiveContent := {subscription_invalid := m_contentUpdateSubscription_invalid};
- v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
+ v_updateRequest.primitiveContent.subscription_invalid.maxNrOfInstances := v_maxNrOfInstances;
v_ae1.start(f_CSE_DMR_UPD_009(int23, v_createRequest, v_updateRequest));//Subscription
v_ae1.done;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 20fd1fba059c3b9ce579cbd2cdc3f3420dab8e60..cef7c23195bd907321dd155a26f9847a8fdbb3b9 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -3817,8 +3817,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
- v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
+ v_updateRequest.primitiveContent := {schedule_invalid := m_contentUpdateSchedule_invalid};
+ v_updateRequest.primitiveContent.schedule_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest));//Schedule
v_ae1.done;
@@ -3826,8 +3826,8 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
- if(v_primitiveContentRetrieveResource.schedule_update_invalid.creationTime == v_creationTime){
+ if(ischosen(v_primitiveContentRetrieveResource.schedule_invalid)) {
+ if(v_primitiveContentRetrieveResource.schedule_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
@@ -3842,8 +3842,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
- v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
+ v_updateRequest.primitiveContent := {pollingChannel_invalid := m_contentUpdatePollingChannel_invalid};
+ v_updateRequest.primitiveContent.pollingChannel_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
v_ae1.done;
@@ -3851,8 +3851,8 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
- if(v_primitiveContentRetrieveResource.pollingChannel_update_invalid.creationTime == v_creationTime){
+ if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_invalid)) {
+ if(v_primitiveContentRetrieveResource.pollingChannel_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
@@ -3937,9 +3937,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
+ v_updateRequest.primitiveContent := {schedule_invalid := m_contentUpdateSchedule_invalid};
- v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
+ v_updateRequest.primitiveContent.schedule_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int18, v_createRequest, v_updateRequest));//Schedule
v_ae1.done;
@@ -3953,9 +3953,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
+ v_updateRequest.primitiveContent := {pollingChannel_invalid := m_contentUpdatePollingChannel_invalid};
- v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
+ v_updateRequest.primitiveContent.pollingChannel_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int15, v_createRequest, v_updateRequest));//PollingChannel
v_ae1.done;