diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 5e77bc30d66e83d0c1ae68c327d0ca9962c3be0c..18816fa8cdad5a4bc7e79aef3efb56d01585f9d6 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -935,7 +935,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}
};
/**
@@ -2675,7 +2675,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
@@ -3227,7 +3227,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_update_invalid m_contentCreateTimeSeriesInvalid (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
+ template (value) TimeSeries_invalid m_contentCreateTimeSeriesInvalid (in template (omit) XSD.String p_name := c_defaultTimeSeriesResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -5196,7 +5196,7 @@ module OneM2M_Templates {
};
- template (value) AE_update_invalid m_contentUpdateAe_invalid := {
+ template (value) AE_invalid m_contentUpdateAe_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -5223,7 +5223,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
@@ -5240,7 +5240,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
@@ -5268,7 +5268,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
@@ -5280,7 +5280,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
@@ -5296,7 +5296,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
@@ -5326,7 +5326,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
@@ -5353,7 +5353,7 @@ module OneM2M_Templates {
choice := omit//O
};
- template (value) TimeSeries_update_invalid m_contentUpdateTimeSeries_invalid := {
+ template (value) TimeSeries_invalid m_contentUpdateTimeSeries_invalid := {
resourceName := omit,//O
resourceType := omit,//NP
resourceID := omit,//NP
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index d80ce19b702479fd1c836f3066ab5906978d2da2..76f6421de0698d7d2fbf26792a2cdf489245aa2a 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -1748,16 +1748,16 @@ type union PrimitiveContent {
RequestPrimitive requestPrimitive,
DebugInfo debugInfo,
//Invalid types
- AE_update_invalid aE_update_invalid,
- ACP_update_invalid aCP_update_invalid,
- Container_update_invalid container_update_invalid,
+ AE_invalid aE_invalid,
+ AccessControlPolicy_invalid accessControlPolicy_invalid,
+ Container_invalid container_invalid,
GenericInterworkingService_invalid genericInterworkingService_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,
- TimeSeries_update_invalid timeSeries_update_invalid
+ Group_invalid group_invalid,
+ PollingChannel_invalid pollingChannel_invalid,
+ Schedule_invalid schedule_invalid,
+ Subscription_invalid subscription_invalid,
+ LocationPolicy_invalid locationPolicy_invalid,
+ TimeSeries_invalid timeSeries_invalid
}
@@ -8329,7 +8329,7 @@ group OptionalResourceTypes {
group InvalidTypes {
- type record AE_update_invalid {
+ type record AE_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -8385,7 +8385,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,
@@ -8418,7 +8418,7 @@ group InvalidTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record Container_update_invalid {
+ type record Container_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -8511,7 +8511,7 @@ group InvalidTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record Group_update_invalid {
+ type record Group_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -8561,7 +8561,7 @@ group InvalidTypes {
};
- type record PollingChannel_update_invalid {
+ type record PollingChannel_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -8578,7 +8578,7 @@ group InvalidTypes {
variant (resourceName) "attribute";
};
- type record Schedule_update_invalid {
+ type record Schedule_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -8610,7 +8610,7 @@ group InvalidTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record Subscription_update_invalid {
+ type record Subscription_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
@@ -8658,7 +8658,7 @@ group InvalidTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record TimeSeries_update_invalid
+ type record TimeSeries_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -8711,7 +8711,7 @@ group InvalidTypes {
- type record LocationPolicy_update_invalid {
+ type record LocationPolicy_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 67635aa3c81aa6aa6162780dc577eca839589f57..8e9a31165d75541ec2da109115e915cf13d43746 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -6040,8 +6040,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
- 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;
@@ -6049,8 +6049,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")
}
}
@@ -6063,8 +6063,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
- 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;
@@ -6072,8 +6072,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")
}
}
@@ -6086,8 +6086,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
- 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;
@@ -6095,8 +6095,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")
}
}
@@ -6109,8 +6109,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
- 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;
@@ -6118,8 +6118,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")
}
}
@@ -6222,9 +6222,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
- 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;
@@ -6236,9 +6236,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
- 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;
@@ -6250,9 +6250,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
- 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;
@@ -6264,9 +6264,9 @@ module OneM2M_Testcases_CSE_Release_1 {
var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
- 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 26049d433ed8f0ecbe9d1e4ca2e18820b1d25f93..7bc41bb77c17f261261390ca7efc778b139d2837 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -1353,8 +1353,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
- 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;
@@ -1362,8 +1362,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")
}
}
@@ -1384,9 +1384,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
- 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;