diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 091299132a2b239c609f7a8ed062bdd73181024a..1dcb91a7bf287d34fe007d2286b25a70debfb921 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 288 2017-05-19 07:18:08Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 289 2017-05-19 08:44:48Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -1116,6 +1116,12 @@ module OneM2M_Functions {
if(ispresent(p_request.primitiveContent.any_1[0].Subscription_optional.creator)) {
p_request.primitiveContent.any_1[0].Subscription_optional.creator := f_getCreator(p_parentIndex);
}
+ //accessControlPolicyIds
+ if(ispresent(p_request.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs)) {
+ if(match(valueof(p_request.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs), v_defaultAcpIDs )){
+ p_request.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
+ }
+ }
}
if (p_resourceType == int4) {//contentInstance
//creator attribute
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index dd067880b4607c655254a110242beb7cba66e177..02bc7afa9466855bfc70cf9a74fd74e0bdb4197e 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 288 2017-05-19 07:18:08Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 289 2017-05-19 08:44:48Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -2725,7 +2725,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.accessControlPolicyIDs := {"NotInitialized"};
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
testcase TC_CSE_DMR_CRE_BV_015_16() runs on CseTester system CseSystem {
@@ -2735,7 +2735,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationTime := "20301231T012345";
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2746,7 +2746,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.labels := {"MyLabel"};
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2757,7 +2757,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2768,7 +2768,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.expirationCounter := 1;
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2779,7 +2779,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.groupID := "MyGroupID";
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2790,7 +2790,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationForwardingURI := "MyForwardingURI";
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2801,7 +2801,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.batchNotify := {0, "PT1S"};
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2812,7 +2812,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.rateLimit := {0, omit};
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2823,7 +2823,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.preSubscriptionNotify := 1;
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2834,7 +2834,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.pendingNotification := int1;
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
testcase TC_CSE_DMR_CRE_BV_015_26() runs on CseTester system CseSystem {
@@ -2844,7 +2844,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationStoragePriority := 1;
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2855,7 +2855,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.latestNotify := true;
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2866,7 +2866,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationContentType := int1;
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2877,7 +2877,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.notificationEventCat := {alt_1 := 100};
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2888,7 +2888,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.creator := "MyCreator";
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2899,7 +2899,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Subscription_optional.subscriberURI := "MySubscriberURI";
- f_CSE_DMR_CRE_BV_015(int3, v_createRequest, c_optionalAttribute);
+ f_CSE_DMR_CRE_BV_015(int23, v_createRequest, c_optionalAttribute);
}
@@ -2911,6 +2911,8 @@ module OneM2M_Testcases {
var integer v_containerIndex := -1;
var integer v_parentIndex := -1;
var integer v_acpAuxIndex := -1;
+ var CseTester v_notifyHandler;
+ var integer v_ae2Index := -1;
const XSD.NCName c_accessControlPolicyIDs := "accessControlPolicyIDs";
// Test control
@@ -2933,6 +2935,9 @@ module OneM2M_Testcases {
v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_parentIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+
+
if(p_resourceType == int4) {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
v_parentIndex := v_containerIndex;