diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 3f6fffe2881191e307f5ba3c1d598c69282fb53d..deae807c36c487dbee30561544b27a699bc2e380 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1801,7 +1801,7 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for ServiceSubscribedNode Resource
*/
- template (value) RequestPrimitive m_createServiceSubscribedNodeBase(in ListOfURIs p_ruleLinks := {""}, in NodeID p_nodeID, in XSD.ID p_cseId) modifies m_create := {
+ template (value) RequestPrimitive m_createServiceSubscribedNodeBase(in ListOfURIs p_ruleLinks := {""}, in NodeID p_nodeID, in template (omit) XSD.ID p_cseId) modifies m_create := {
requestIdentifier := testcasename() & "-m_createServiceSubscribedNodeBase",
resourceType := int20,
primitiveContent := {serviceSubscribedNode := m_contentServiceSubscribedNodeBase(p_ruleLinks, p_nodeID, p_cseId )}
@@ -5026,10 +5026,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := PX_M2M_SUB_ID, //M
- M2M_SS_ID := PX_M2M_SS_ID, //O
- Status := omit, //NP default INACTIVE
- Activate := omit, //NP default false
+ m2M_Sub_ID := PX_M2M_SUB_ID, //M
+ m2M_SS_ID := PX_M2M_SS_ID, //O
+ status := omit, //NP default INACTIVE
+ activate_ := omit, //NP default false
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -5066,10 +5066,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := PX_M2M_SUB_ID, //M
- M2M_SS_ID := PX_M2M_SS_ID, //O
- Status := omit, //NP default INACTIVE
- Activate := omit, //NP default false
+ m2M_Sub_ID := PX_M2M_SUB_ID, //M
+ m2M_SS_ID := PX_M2M_SS_ID, //O
+ status := omit, //NP default INACTIVE
+ activate_ := omit, //NP default false
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -5106,10 +5106,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := PX_M2M_SUB_ID, //M
- M2M_SS_ID := PX_M2M_SS_ID, //O
- Status := omit, //NP
- Activate := omit, //NP
+ m2M_Sub_ID := PX_M2M_SUB_ID, //M
+ m2M_SS_ID := PX_M2M_SS_ID, //O
+ status := omit, //NP
+ activate_ := omit, //NP
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -5146,10 +5146,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := PX_M2M_SUB_ID, //M
- M2M_SS_ID := PX_M2M_SS_ID, //O
- Status := omit, //NP
- Activate := omit, //NP default false
+ m2M_Sub_ID := PX_M2M_SUB_ID, //M
+ m2M_SS_ID := PX_M2M_SS_ID, //O
+ status := omit, //NP
+ activate_ := omit, //NP default false
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -5186,10 +5186,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := PX_M2M_SUB_ID, //M
- M2M_SS_ID := PX_M2M_SS_ID, //O
- Status := omit, //NP
- Activate := omit, //NP default false
+ m2M_Sub_ID := PX_M2M_SUB_ID, //M
+ m2M_SS_ID := PX_M2M_SS_ID, //O
+ status := omit, //NP
+ activate_ := omit, //NP default false
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -5253,7 +5253,7 @@ module OneM2M_Templates {
choice := omit //O
};
- template (value) ServiceSubscribedNode_optional m_contentServiceSubscribedNodeBase (in ListOfURIs p_ruleLinks, in NodeID p_nodeID, in XSD.ID p_cseId) := {
+ template (value) ServiceSubscribedNode_optional m_contentServiceSubscribedNodeBase (in ListOfURIs p_ruleLinks, in NodeID p_nodeID, in template (omit) XSD.ID p_cseId) := {
resourceName := "MyServiceServiceSubscribedNodeResource-With-NodeID", //O
resourceType := omit, //M
resourceID := omit, //M
@@ -7124,10 +7124,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := omit, //NP
- M2M_SS_ID := omit, //O
- Status := omit, //NP
- Activate := omit, //O
+ m2M_Sub_ID := omit, //NP
+ m2M_SS_ID := omit, //O
+ status := omit, //NP
+ activate_ := omit, //O
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -7144,6 +7144,7 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
+ maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
@@ -7220,10 +7221,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := omit, //NP
- M2M_SS_ID := omit, //O
- Status := omit, //NP
- Activate := omit, //O
+ m2M_Sub_ID := omit, //NP
+ m2M_SS_ID := omit, //O
+ status := omit, //NP
+ activate_ := omit, //O
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -7240,6 +7241,7 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
+ maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
@@ -7264,10 +7266,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //O
- M2M_Sub_ID := omit, //NP
- M2M_SS_ID := omit, //O
- Status := omit, //NP
- Activate := true, //O
+ m2M_Sub_ID := omit, //NP
+ m2M_SS_ID := omit, //O
+ status := omit, //NP
+ activate_ := true, //O
activationTime := omit, //NP
deactivationTime := omit, //NP
serviceSubscriptionDuration := omit, //O
@@ -7284,6 +7286,7 @@ module OneM2M_Templates {
maxNotificationRate := omit, //O
maxNumFlexContainers := omit, //O
maxNumInstancesPerFlexContainer := omit, //O
+ maxNumUsers := omit, //O
defaultAccessControlPrivileges := omit, //O
choice := omit //NP
@@ -7294,14 +7297,14 @@ module OneM2M_Templates {
*/
template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileDeactivated modifies m_contentUpdateServiceSubscriptionProfileActivated := {
- Activate := false //O
+ activate_ := false //O
};
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEsZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEsZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumAEs := 0 //O
@@ -7310,7 +7313,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEs2 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumAEs2 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumAEs := 2 //O
@@ -7319,7 +7322,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainersZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainersZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumContainers := 0 //O
@@ -7328,7 +7331,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainers2 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumContainers2 modifies m_contentUpdateServiceSubscriptionProfileActivated:= {
maxNumContainers := 2 //O
@@ -7337,7 +7340,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeriesZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeriesZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumTimeSeries := 0 //O
@@ -7346,7 +7349,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeries3 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumTimeSeries3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumTimeSeries := 3 //O
@@ -7355,7 +7358,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainerOne := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainerOne modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumInstancesPerContainer := 1 //O
@@ -7364,7 +7367,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainer3 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfilemaxNumInstancesPerContainer3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumInstancesPerContainer := 3 //O
@@ -7373,7 +7376,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeriesZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeriesZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumInstancesPerTimeSeries := 0 //O
@@ -7382,7 +7385,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeries3 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumInstancesPerTimeSeries3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumInstancesPerTimeSeries := 3 //O
@@ -7391,7 +7394,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroupZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroupZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxMembersPerGroup := 0 //O
@@ -7400,7 +7403,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroup3 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxMembersPerGroup3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxMembersPerGroup := 3 //O
@@ -7409,7 +7412,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes100 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes100 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumBytes := 100 //O
@@ -7418,7 +7421,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes300 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumBytes300 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumBytes := 300 //O
@@ -7427,7 +7430,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodesZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodesZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumNodes := 0 //O
@@ -7436,7 +7439,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodes3 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumNodes3 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumNodes := 3 //O
@@ -7445,7 +7448,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsersZero := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsersZero modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumUsers := 0 //O
@@ -7453,7 +7456,7 @@ module OneM2M_Templates {
/**
* @desc PrimitiveContent for UPDATE operation for ServiceSubscriptionProfile resource
*/
- template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsers2 := {
+ template (value) M2mServiceSubscriptionProfile_optional m_contentUpdateServiceSubscriptionProfileMaxNumUsers2 modifies m_contentUpdateServiceSubscriptionProfileActivated := {
maxNumUsers := 2 //O
@@ -9229,10 +9232,10 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
- M2M_Sub_ID := ?, //M
- M2M_SS_ID := *, //O
- Status := ?, //M
- Activate := ?, //M
+ m2M_Sub_ID := ?, //M
+ m2M_SS_ID := *, //O
+ status := ?, //M
+ activate_ := ?, //M
activationTime := *, //O
deactivationTime := *, //O
serviceSubscriptionDuration := *, //O
@@ -9249,6 +9252,7 @@ module OneM2M_Templates {
maxNotificationRate := *, //O
maxNumFlexContainers := *, //O
maxNumInstancesPerFlexContainer := *, //O
+ maxNumUsers := *, //O
defaultAccessControlPrivileges := *, //O
choice := * //O
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index a7478c7c58497817cbc7da8ddf315ce06e00211c..c873ff98077f9d44715cd519da0c2845da9f5c50 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -1171,10 +1171,10 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
//TODO To be removed/replaced by the type defined in XSDs
- XSD.ID M2M_Sub_ID optional,
- XSD.ID M2M_SS_ID optional,
- ServiceSubscriptionStatus Status optional ,
- XSD.Boolean Activate optional,
+ XSD.ID m2M_Sub_ID optional,
+ XSD.ID m2M_SS_ID optional,
+ ServiceSubscriptionStatus status optional ,
+ XSD.Boolean activate_ optional,
Timestamp activationTime optional,
Timestamp deactivationTime optional,
XSD.Duration serviceSubscriptionDuration optional,
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index d8fe769dde45f28ef265a3aec71c925614f4768f..e897c8a8e7c0fddf196e507e464c7a600dea4f05 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit d8fe769dde45f28ef265a3aec71c925614f4768f
+Subproject commit e897c8a8e7c0fddf196e507e464c7a600dea4f05
diff --git a/OneM2M_Testcases_CSE_Release_4.ttcn b/OneM2M_Testcases_CSE_Release_4.ttcn
index 674cc6ee88183d5f4bd4f55cd85d48216dc9351a..a73734729937a1d795cff542fb3d868c8461d7d7 100644
--- a/OneM2M_Testcases_CSE_Release_4.ttcn
+++ b/OneM2M_Testcases_CSE_Release_4.ttcn
@@ -8450,7 +8450,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_subscriptionProfileIndex := -1;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1; // maxNumAEs 1
- var template RequestPrimitive v_request;
+ var RequestPrimitive v_request;
// directly on CSEBase from superAE
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -8517,8 +8517,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_updateRequest;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1;
- var template RequestPrimitive v_requestContainerCreate;
- v_requestContainerCreate
+ var RequestPrimitive v_requestContainerCreate;
+
// directly on CSEBase from superAE, Create serviceSubscriptionProfile with maxNumContainers = 1
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -8587,7 +8587,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1;
var template RequestPrimitive v_createContentInstanceRequest := m_createContentInstanceBase;
- var template RequestPrimitive v_request;
+ var RequestPrimitive v_request;
// directly on CSEBase from superAE, Create serviceSubscriptionProfile with maxNumInstancesPerContainer = 1
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -8680,7 +8680,7 @@ module OneM2M_Testcases_CSE_Release_4 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Create another TimeSeries container. maxNumTimeSeries allowed 1
- v_createTimeSeriesRequest.primitiveContent.resourceName := c_defaultTimeSeriesResourceName & int2str(2);
+ v_createTimeSeriesRequest.primitiveContent.timeSeries.resourceName := c_defaultTimeSeriesResourceName & int2str(2);
v_request := f_getCreateRequestPrimitive(int29, v_createTimeSeriesRequest, v_aeIndex);
f_send(e_mcaPort, m_request(v_request));
@@ -9041,7 +9041,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_subscriptionProfileIndex := -1;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1; // maxNumAEs 1
- var template RequestPrimitive v_request;
+ var RequestPrimitive v_request;
// directly on CSEBase from superAE
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -9102,8 +9102,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_updateRequest;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1;
- var template RequestPrimitive v_requestContainerCreate;
- v_requestContainerCreate
+ var RequestPrimitive v_requestContainerCreate;
+
// directly on CSEBase from superAE, Create serviceSubscriptionProfile with maxNumContainers = 1
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -9171,7 +9171,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1;
var template RequestPrimitive v_createContentInstanceRequest := m_createContentInstanceBase;
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
- var template RequestPrimitive v_request;
+ var RequestPrimitive v_request;
// directly on CSEBase from superAE, Create serviceSubscriptionProfile with maxNumInstancesPerContainer = 1
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -9642,7 +9642,7 @@ module OneM2M_Testcases_CSE_Release_4 {
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_subscriptionProfileIndex);
- if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.Activate, true))) {
+ if(not(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.activate_)) {
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile Activate is not TRUE");
@@ -9654,13 +9654,13 @@ module OneM2M_Testcases_CSE_Release_4 {
}
- if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.deactivationTime, null ))){
+ if(ispresent(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.deactivationTime)){
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile deactivationTime does not match with null.");
}
- if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.Status, active ))){
+ if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, active ))){
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile does not has Status as ACTIVE in updated content.");
}
@@ -9726,7 +9726,7 @@ module OneM2M_Testcases_CSE_Release_4 {
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_subscriptionProfileIndex);
- if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.Activate, false))) {
+ if(not(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.activate_)) {
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile Activate is not FALSE");
@@ -9739,7 +9739,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
- if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.Status, inactive ))){
+ if(not(match(vc_primitiveContentRetrievedResource.m2mServiceSubscriptionProfile.status, inactive ))){
setverdict(fail, __SCOPE__&":INFO: Retrieved ServiceSubscriptionProfile does not has Status as INACTIVE in updated content.");
}
@@ -10084,13 +10084,13 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_SSM_SSP_UPD_003_MIT() runs on AeSimu system CseSystem {
var integer v_subscriptionProfileIndex := -1;
- var integer v_aeIndex := -1;
+ var integer v_aeIndex, v_timeSeriesIndex := -1;
var RequestPrimitive v_updateRequest;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue2;
var template RequestPrimitive v_updateRequestPrimitive := m_updateServiceSubscriptionProfileMaxNumInstancesPerTimeSeriesZero;
- var template RequestPrimitive v_createTimeSeriesRequest := m_createTimeSeriesBase;
+ var RequestPrimitive v_createTimeSeriesRequest := m_createTimeSeriesBase;
// directly on CSEBase from superAE, Create serviceSubscriptionProfile with maxNumInstancesPerContainer = 2
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -10103,7 +10103,10 @@ module OneM2M_Testcases_CSE_Release_4 {
// Create TimeSeries and 1 TimeSeriesInstance under
v_aeIndex := f_getLatestResourceIndex(vc_ae2);
v_createTimeSeriesRequest.from_ := PX_ALLOWED_C_AE_IDS[0];
- vc_ae2.start(f_CSE_DMR_CRE_001(int30, m_createTimeSeriesInstanceBase, v_createTimeSeriesRequest));//TimeSeriesInstance
+ vc_ae2.start(f_cse_createResource(int29, v_createTimeSeriesRequest, v_aeIndex));
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+ v_timeSeriesIndex := f_getLatestResourceIndex(vc_ae2);
+ vc_ae2.start(f_cse_createResource(int30, m_createTimeSeriesInstanceBase, v_timeSeriesIndex));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
@@ -10808,13 +10811,13 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_SSM_SSP_UPD_004_MIT() runs on AeSimu system CseSystem {
var integer v_subscriptionProfileIndex := -1;
- var integer v_aeIndex := -1;
+ var integer v_aeIndex, v_timeSeriesIndex := -1;
var RequestPrimitive v_updateRequest;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue2;
var template RequestPrimitive v_updateRequestPrimitive := m_updateServiceSubscriptionProfileMaxNumInstancesPerTimeSeries3;
- var template RequestPrimitive v_createTimeSeriesRequest := m_createTimeSeriesBase;
+ var RequestPrimitive v_createTimeSeriesRequest := m_createTimeSeriesBase;
// directly on CSEBase from superAE, Create serviceSubscriptionProfile with maxNumInstancesPerContainer = 2
v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
@@ -10827,11 +10830,12 @@ module OneM2M_Testcases_CSE_Release_4 {
// Create TimeSeries and 1 TimeSeriesInstance under
v_aeIndex := f_getLatestResourceIndex(vc_ae2);
v_createTimeSeriesRequest.from_ := PX_ALLOWED_C_AE_IDS[0];
-
- vc_ae2.start(f_CSE_DMR_CRE_001(int30, m_createTimeSeriesInstanceBase, v_createTimeSeriesRequest));//TimeSeriesInstance
+ vc_ae2.start(f_cse_createResource(int29, v_createTimeSeriesRequest, v_aeIndex));
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+ v_timeSeriesIndex := f_getLatestResourceIndex(vc_ae2);
+ vc_ae2.start(f_cse_createResource(int30, m_createTimeSeriesInstanceBase, v_timeSeriesIndex));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
// Update ServiceSubscriptionProfile and make maxNumInstancesPerTimeSeries to 3
v_updateRequest := f_getUpdateRequestPrimitive(int11, v_subscriptionProfileIndex, v_updateRequestPrimitive);
f_send(e_mcaPort, m_request(v_updateRequest));
@@ -11467,14 +11471,14 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_SSM_SSN_001_CRE() runs on AeSimu system CseSystem {
var integer v_resourceIndex := -1;
- var integer v_serviceSubscribedAppRuleIndex := -1;
+ var integer v_serviceSubscribedAppRuleIndex, v_subscriptionProfileIndex := -1;
var XSD.ID v_cseId := PX_TS_CSE1.cseId;
var template ListOfM2MID v_allowedUsers := {""};
- ListOfM2MID v_allowedAEs := {""}
- NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
+ var ListOfM2MID v_allowedAEs := {""}
+ var NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
- var template RequestPrimitive v_createServiceSubscribedNode;
+ var RequestPrimitive v_createServiceSubscribedNode;
var template RequestPrimitive v_createServiceSubscribedAppRule;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1; // maxNumAEs 1
@@ -11487,16 +11491,16 @@ module OneM2M_Testcases_CSE_Release_4 {
// ServiceSubscribedNode as a child of SubscriptionProfile with ruleLinks pointing to SubscribedAppRule
v_createServiceSubscribedNode := m_createServiceSubscribedNodeBase({f_getResourceAddress(v_serviceSubscribedAppRuleIndex)}, v_nodeID, v_cseId);
- v_request := f_getCreateRequestPrimitive(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
+ v_createServiceSubscribedNode := f_getCreateRequestPrimitive(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
- f_send(e_mcaPort, m_request(v_request));
+ f_send(e_mcaPort, m_request(v_createServiceSubscribedNode));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource type ServiceSubscribedNode created successfully");
- f_checkAttributesToBeSaved(int11, v_request, vc_response.primitive.responsePrimitive);
+ f_checkAttributesToBeSaved(int11, v_createServiceSubscribedNode, vc_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int11, -1);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -11547,8 +11551,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var template ListOfM2MID v_allowedUsers := {""};
var XSD.ID v_cseId := PX_TS_CSE1.cseId;
- ListOfM2MID v_allowedAEs := {""}
- NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
+ var ListOfM2MID v_allowedAEs := {""}
+ var NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
var template PrimitiveContent v_contentResponse;
@@ -11621,8 +11625,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var template ListOfM2MID v_allowedUsers := {""};
var XSD.ID v_cseId := PX_TS_CSE1.cseId;
- ListOfM2MID v_allowedAEs := {""}
- NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
+ var ListOfM2MID v_allowedAEs := {""}
+ var NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
var template PrimitiveContent v_contentResponse;
@@ -11697,8 +11701,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var template ListOfM2MID v_allowedUsers := {""};
var XSD.ID v_cseId := PX_TS_CSE1.cseId;
- ListOfM2MID v_allowedAEs := {""}
- NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
+ var ListOfM2MID v_allowedAEs := {""}
+ var NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
var template PrimitiveContent v_contentResponse;
@@ -11781,12 +11785,12 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_serviceSubscribedNodeIndex := -1;
var template ListOfM2MID v_allowedUsers := {""};
- ListOfM2MID v_allowedAEs := {""}
- NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
+ var ListOfM2MID v_allowedAEs := {""}
+ var NodeID v_nodeID := "urn:gsma:imei:90420156-025763-0"; //Dummy ID
var template PrimitiveContent v_contentResponse;
- var template RequestPrimitive v_createServiceSubscribedNode;
+ var RequestPrimitive v_createServiceSubscribedNode;
var template RequestPrimitive v_createServiceSubscribedAppRule;
var template RequestPrimitive v_createServiceSubscriptionProfile := m_createM2mServiceSubscriptionProfileMaxValue1; // maxNumAEs 1
@@ -11801,9 +11805,9 @@ module OneM2M_Testcases_CSE_Release_4 {
// and no CSE-ID
v_createServiceSubscribedNode := m_createServiceSubscribedNodeBase({f_getResourceAddress(v_serviceSubscribedAppRuleIndex)}, v_nodeID, omit);
- v_request := f_getCreateRequestPrimitive(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
+ v_createServiceSubscribedNode := f_getCreateRequestPrimitive(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
- f_send(e_mcaPort, m_request(v_request));
+ f_send(e_mcaPort, m_request(v_createServiceSubscribedNode));
tc_ac.start;
alt {