diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 85df974ca9cc6be3ce60e2a2ab3436cd9e7c07f4..0bcd2770ce7f0aad0515df15410da0cb353faec7 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2128,8 +2128,29 @@ module OneM2M_Functions {
v_myResource.contentInstance.expirationTime := "20301231T012345";
}
v_myResource.contentInstance.stateTag := 0;
- v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
- v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
+ if(not(ispresent(p_resource.contentInstance.content))) {
+ v_myResource.contentInstance.contentSize := 0;
+ v_myResource.contentInstance.content := omit;
+ } else {
+ v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
+ v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
+ }
+ }
+
+ } else if(p_resourceType == int23 and ispresent(p_resource)) {//Subscription
+ if(ischosen(p_resource.subscription)){
+ v_myResource.subscription := valueof(p_resource.subscription);
+ v_myResource.subscription.resourceID := "sub" & int2str(v_resourceIndex);
+ if(not(ispresent(p_resource.subscription.resourceName))) {
+ v_myResource.subscription.resourceName := "subscription" & int2str(v_resourceIndex);
+ }
+ v_myResource.subscription.resourceType := p_resourceType;
+ v_myResource.subscription.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+ v_myResource.subscription.creationTime := fx_generateTimestamp();
+ v_myResource.subscription.lastModifiedTime := v_myResource.subscription.creationTime;
+ if(not(ispresent(p_resource.subscription.expirationTime))) {
+ v_myResource.subscription.expirationTime := "20301231T012345";
+ }
}
}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 1c9b39e333aec3149ee26705d18d11f369355518..03a6dc7b17f4f2dc5eae005b43c534bb7cd542af 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -662,7 +662,7 @@ module OneM2M_Templates {
to_ := p_to,
from_ := p_from,
resourceType := int10002,
- primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnnc(-)}
+ primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnncBase(-)}
};
@@ -719,18 +719,10 @@ module OneM2M_Templates {
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
- /**
- * @desc Reception template for CREATE RemoteCSE
- */
- template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int16,
- primitiveContent := {remoteCSE := ?} //{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
- };
-
/**
* @desc Base reception template for CREATE RemoteCSE
*/
- template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+ template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
};
@@ -754,13 +746,13 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int3,
- primitiveContent := {container := ?}
+ primitiveContent := {container := mw_contentCreateContainerBase}
};
/**
* @desc Base Reception template for CREATE ContainerAnnc
*/
- template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+ template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10003,
primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
};
@@ -794,7 +786,7 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10014,
- primitiveContent := {contentInstanceAnnc := ?}
+ primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
};
/**
@@ -802,17 +794,9 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int4,
- primitiveContent := {contentInstance := ?}
+ primitiveContent := {contentInstance := mw_contentCreateContentInstanceBase}
};
- /**
- * @desc Base Reception template for CREATE ContentInstanceAnnc
- */
- template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int10014,
- primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
- };
-
/**
* @desc Base CREATE request primitive for Delivery resource
*/
@@ -849,17 +833,9 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10009,
- primitiveContent := {groupAnnc := ?}
+ primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
};
- /**
- * @desc Base Reception template for CREATE GroupAnnc
- */
- template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int10009,
- primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
- };
-
/**
* @desc Base CREATE request primitive for MgmtCmd resource
*/
@@ -891,14 +867,6 @@ module OneM2M_Templates {
* @desc Reception template for CREATE MgmtObjAnnc
*/
template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int10013,
- primitiveContent := {announcedMgmtResource := ?}
- };
-
- /**
- * @desc Base Reception template for CREATE MgmtObjAnnc
- */
- template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10013,
primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
};
@@ -926,7 +894,7 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10014,
- primitiveContent := {nodeAnnc := ?}
+ primitiveContent := {nodeAnnc := mw_contentCreateNodeAnncBase}
};
/**
@@ -966,18 +934,10 @@ module OneM2M_Templates {
* @desc Reception template for CREATE ScheduleAnnc
*/
template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int10018,
- primitiveContent := {scheduleAnnc := ?}
- };
-
- /**
- * @desc Base Reception template for CREATE ScheduleAnnc
- */
- template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10018,
primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
};
-
+
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
resourceType := int19,//FIXME Is this the correct value?
@@ -1014,7 +974,7 @@ module OneM2M_Templates {
*/
template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int23,
- primitiveContent := {subscription := ?}
+ primitiveContent := {subscription := mw_contentCreateSubscriptionBase}
};
template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress,
@@ -1051,14 +1011,6 @@ module OneM2M_Templates {
* @desc Reception template for CREATE LocationPolicyAnnc
*/
template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int10010,
- primitiveContent := {locationPolicyAnnc := ?}
- };
-
- /**
- * @desc Base Reception template for CREATE LocationPolicyAnnc
- */
- template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10010,
primitiveContent := {locationPolicyAnnc := mw_contentCreateLocationPolicyAnncBase}
};
@@ -1386,7 +1338,7 @@ module OneM2M_Templates {
* @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
* @param p_labels Labels
*/
- template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template (omit) Labels p_labels := omit) := {
+ template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnncBase (in template (omit) Labels p_labels := omit) := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
@@ -1635,7 +1587,49 @@ module OneM2M_Templates {
hostedCSELink := omit,//O
choice := omit//O
};
+
+ /**
+ * @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 := *) := {
+
+ resourceName := p_name,//O
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := *,//O
+ accessControlPolicyIDs := *,//O
+ expirationTime := *,//O
+ announceTo := *,//O
+ announcedAttribute := *,//O
+ nodeID := ?,//M
+ hostedCSELink := *,//O
+ choice := *//O
+ };
+ /**
+ * @desc Base reception template primitiveContent for CREATE operation for NodeAnnc resource
+ * @param p_name Resource name
+ */
+ template NodeAnnc_optional mw_contentCreateNodeAnncBase := {
+
+ resourceName := omit,//NP
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := ?,//M
+ accessControlPolicyIDs := ?,//M
+ expirationTime := ?,//M
+ link := ?,//M
+ nodeID := ?,//M
+ hostedCSELink := *,//O
+ choice := omit//NP
+ };
/**
* @desc Base primitiveContent for CREATE operation for PollingChannel resource
@@ -1759,6 +1753,39 @@ module OneM2M_Templates {
choice := omit//NP
};
+ /**
+ * @desc Base reception template primitiveContent for CREATE operation for Subscription resource
+ * @param p_notificationURI Notification URI
+ * @param p_name Resource name
+ */
+ template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
+ resourceName := p_name,//O
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := *,//O
+ accessControlPolicyIDs := *,//O
+ expirationTime := *,//O
+ eventNotificationCriteria := *,//O
+ expirationCounter := *,//O
+ notificationURI := ?,//M
+ groupID := *,//O
+ notificationForwardingURI := *,//O
+ batchNotify := *,//O
+ rateLimit := *,//O
+ preSubscriptionNotify := *,//O
+ pendingNotification := *,//O
+ notificationStoragePriority := *,//O
+ latestNotify := *,//O
+ notificationContentType := *, //O
+ notificationEventCat := *,//O
+ creator := *,//O
+ subscriberURI := *,//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) EventNotificationCriteria p_eventNotificationCriteria,
@@ -1824,7 +1851,30 @@ module OneM2M_Templates {
ontologyRef := omit,//O
content := p_content//M
};
-
+
+ /**
+ * @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 := *) := {
+ resourceName := p_name,//O
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := *,//O
+ expirationTime := *,//O
+ announceTo := *,//O
+ announcedAttribute := *,//O
+ stateTag := omit,//NP
+ creator := *,//O
+ contentInfo := *,//O
+ contentSize := omit,//NP
+ ontologyRef := *,//O
+ content := ?//M
+ };
+
/**
* @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
* @param p_primitiveContent Content for the ContentInstanceAnnc
@@ -1873,6 +1923,34 @@ module OneM2M_Templates {
ontologyRef := omit,//O
choice := omit//NP
};
+
+ /**
+ * @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 := *):= {
+ resourceName := p_name,//O
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := *,//O
+ accessControlPolicyIDs := *,//O
+ expirationTime := *,//O
+ announceTo := *,//O
+ announcedAttribute := *,//O
+ stateTag := omit,//NP
+ creator := *,//O
+ maxNrOfInstances := *,//O
+ maxByteSize := *,//O
+ maxInstanceAge := *,//O
+ currentNrOfInstances := omit,//NP
+ currentByteSize := omit,//NP
+ locationID := *,//O
+ ontologyRef := *,//O
+ choice := *//NP
+ };
/**
* @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 2a05ef403c75aec7edf1aad284fb8dc3c4e15d5a..088debddf908a588581dd93eef6425eea7bf332b 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -1678,7 +1678,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
- vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+ vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 4d1c2b1c0745c716bb83044bbe5671a8df4f7b6d..76cf7449d251f1a1ebcfb1489630c61b345b2207 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -1834,7 +1834,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
tc_ac.start;
alt {
- [not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
+ [not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSE)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
@@ -2732,7 +2732,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+ vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Send Trigger Message
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index a3ff9c9e91cf2f99fb804dd4bc78628c85fa85b3..20fd1fba059c3b9ce579cbd2cdc3f3420dab8e60 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -1332,7 +1332,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
- v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
+ v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnnc));//Container
v_ae1.done;
}
@@ -1344,7 +1344,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
- v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
+ v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnnc));//ContentInstance
v_ae1.done;
}
@@ -1357,7 +1357,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
- v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
+ v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnnc));//Group
v_ae1.done;
}
@@ -1370,7 +1370,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
- v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
+ v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnnc));//LocationPolicy
v_ae1.done;
}
@@ -1383,7 +1383,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
- v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
+ v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnnc));//MgmtObj
v_ae1.done;
}
@@ -1409,7 +1409,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
- v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnnc));//Schedule
v_ae1.done;
}
@@ -1434,7 +1434,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
- v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
+ v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnnc()));//Container
v_ae1.done;
if(getverdict == pass){
@@ -1466,7 +1466,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;
v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"}; //Correct value? Shall be indicated in TP?
- v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
+ v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
v_ae1.done;
if(getverdict == pass){
@@ -1497,7 +1497,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
- v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
+ v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnnc()));//Group
v_ae1.done;
if(getverdict == pass){
@@ -1528,7 +1528,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
- v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
+ v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
v_ae1.done;
if(getverdict == pass){
@@ -1559,7 +1559,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.mgmtResource.description := v_description;
v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
- v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
+ v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnnc()));//MgmtObj
v_ae1.done;
if(getverdict == pass){
@@ -1606,7 +1606,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
- v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
v_ae1.done;
if(getverdict == pass){
@@ -7599,7 +7599,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
- var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
@@ -7613,7 +7613,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
- var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
@@ -7627,7 +7627,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
- var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
@@ -7641,7 +7641,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createGroupBase;
- var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
@@ -7655,7 +7655,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
- var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};