diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 469f8538edb6f50be1c54b9b33ba0dd67f8aa412..091299132a2b239c609f7a8ed062bdd73181024a 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 287 2017-05-19 06:59:12Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 288 2017-05-19 07:18:08Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -281,7 +281,6 @@ module OneM2M_Functions {
}
- //Added by @Naum
function f_cse_preamble_createServiceSubscribedAppRule(in template ListOfM2MID p_allowedAEs := {""}) runs on CseTester return integer {//c_CRUDNDi
var integer v_serviceSubscribedAppRuleIndex := -1;
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index ce86553eb1f93174bc5079e1c0e5e87f5821793a..7fa2d172c41675d5530d927e0374f633f6ccda35 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- * $Id: OneM2M_Pixits.ttcn 287 2017-05-19 06:59:12Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 288 2017-05-19 07:18:08Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
@@ -61,13 +61,12 @@ module OneM2M_Pixits {
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
modulepar boolean PX_FROM_IS_AE_ID := true;
- //@Martin
+
//for checking whether the locationPolicy creation request is originated from a ASN-AE
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases
modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases
- //@Martin
//constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 9e78d7fcb6fc89a33f766bb2cd4c80a8aba0a3b3..011f033d379cefa3d49d0393ee02ad0ec8a1705a 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 287 2017-05-19 06:59:12Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 288 2017-05-19 07:18:08Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -77,7 +77,6 @@ module OneM2M_Templates {
forcedFields := p_forcedFields
};
- //Added by @Naum
template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
primitive := { requestPrimitive := p_requestPrimitive}
};
@@ -241,7 +240,6 @@ module OneM2M_Templates {
}
};
- //@ACV
/**
* @desc Base UPDATE request primitive for ContentInstance resource
*/
@@ -309,8 +307,7 @@ module OneM2M_Templates {
}
};
- //@Martin
- template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod) modifies m_update := {
+ template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod) modifies m_update := {
to_ := p_locResourceAddress,
requestIdentifier := "m_updateLocationPolicy",
primitiveContent := {
@@ -409,7 +406,6 @@ module OneM2M_Templates {
}
};
- //Added by @Naum
template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000),
@@ -430,7 +426,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
- from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"//@Martin
+ from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000),
resourceType := int2,
primitiveContent := {
@@ -484,7 +480,6 @@ module OneM2M_Templates {
}
};
- //Added by @Naum
template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
from_ := PX_SUPER_USER,
requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
@@ -841,7 +836,6 @@ module OneM2M_Templates {
}
};
- //@Martin
template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) NodeID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
requestIdentifier := testcasename() & "-m_createLocationPolicy" & f_rnd(1, 1000000), //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
@@ -1147,7 +1141,6 @@ module OneM2M_Templates {
accessControlObjectDetails_list := {}
}
- //added by @Naum
template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
resourceName := omit,
resourceType := omit,
@@ -1561,8 +1554,6 @@ module OneM2M_Templates {
choice := omit //NA
};
-
- //@Martin
template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod, in template (value) NodeID p_locationTargetID, in template (value) XSD.AnyURI p_locationServerAddress) := {
resourceName := c_defaultLocationPolicyResourceName, //O
resourceType := omit, //NP
@@ -1587,7 +1578,6 @@ module OneM2M_Templates {
};
- //@ACV
/**
* @desc Base reception template of primitiveContent for CREATE operation for LocationPolicyAnnc resource
*/
@@ -1612,7 +1602,6 @@ module OneM2M_Templates {
locationStatus := * //OA
};
- //@Martin
template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
in template (omit) NotificationEventType p_notifEventType,
in template (omit) XSD.AnyURI p_subReference,
@@ -1844,7 +1833,6 @@ module OneM2M_Templates {
choice := omit//NP
};
- //@ACV
/**
* @desc Base primitiveContent for UPDATE operation for ContentInstance resource
*/
@@ -1869,8 +1857,7 @@ module OneM2M_Templates {
choice := omit //O
};
- //@Martin
- template (value) LocationPolicy_optional m_contentUpdateLocationPolicy (in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) := {
+ template (value) LocationPolicy_optional m_contentUpdateLocationPolicy (in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index c127692174b95238b830ecf9e725778a49d41d88..d0fb0d81bd388123b24122cbe83eac3f18ac95ea 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 268 2017-05-17 03:29:49Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 288 2017-05-19 07:18:08Z reinaortega $
* @desc OneM2M data types module
*
*/
@@ -6484,7 +6484,6 @@ with {
group OptionalResourceTypes {
- //Added by @Naum
type record AEAnnc_optional
{
XSD.NCName resourceName optional,
@@ -6845,8 +6844,6 @@ group OptionalResourceTypes {
variant (choice.semanticDescriptor_list[-]) "name as 'semanticDescriptor'";
};
-
- //added by @Naum
type record CSEBase_optional
{
XSD.NCName resourceName optional,
@@ -7172,7 +7169,6 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
};
- //Added by @Naum
type record ServiceSubscribedAppRule_optional
{
XSD.NCName resourceName optional,
@@ -7293,7 +7289,6 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
};
- //@Martin
type record LocationPolicy_optional
{
XSD.NCName resourceName optional,
@@ -7536,7 +7531,6 @@ group InvalidTypes {
EventCat notificationEventCat optional
}
- //@Martin
type record LocationPolicy_update_invalid {
Timestamp creationTime optional,//invalid field to be used for BI tests
Timestamp lastModifiedTime optional,//invalid field to be used for BI tests
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index c8fa74ef2eea4b1624335bb933a5f415a94a6284..dd067880b4607c655254a110242beb7cba66e177 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 287 2017-05-19 06:59:12Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 288 2017-05-19 07:18:08Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -2986,7 +2986,6 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Container_optional.announceTo := {f_getAnnouncementTargetPoA()};
- //f_CSE_DMR_CRE_BV_016(int3, v_createRequest, mw_createContainerAnnc);//Container //@ACV
f_CSE_DMR_CRE_BV_016(int3, v_createRequest, mw_createContainerAnncBase);//Container
}
@@ -2997,7 +2996,6 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.announceTo := {f_getAnnouncementTargetPoA()};
- //f_CSE_DMR_CRE_BV_016(int4, v_createRequest, mw_createContentInstanceAnnc);//ContentInstance @ACV
f_CSE_DMR_CRE_BV_016(int4, v_createRequest, mw_createContentInstanceAnncBase);//ContentInstance
}
@@ -3008,7 +3006,6 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Group_optional.announceTo := {f_getAnnouncementTargetPoA()};
- //f_CSE_DMR_CRE_BV_016(int9, v_createRequest, mw_createGroupAnnc);//Group //@ACV
f_CSE_DMR_CRE_BV_016(int9, v_createRequest, mw_createGroupAnncBase);//Group
}
@@ -3019,7 +3016,6 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].LocationPolicy_optional.announceTo := {f_getAnnouncementTargetPoA()};
- //f_CSE_DMR_CRE_BV_016(int10, v_createRequest, mw_createLocationPolicyAnnc);//LocationPolicy //@ACV
f_CSE_DMR_CRE_BV_016(int10, v_createRequest, mw_createLocationPolicyAnncBase);//LocationPolicy
}
@@ -3030,7 +3026,6 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].MgmtObj_optional.announceTo := {f_getAnnouncementTargetPoA()};
- //f_CSE_DMR_CRE_BV_016(int13, v_createRequest, mw_createMgmtObjAnnc);//MgmtObj //@ACV
f_CSE_DMR_CRE_BV_016(int13, v_createRequest, mw_createMgmtObjAnncBase);//MgmtObj
}
@@ -3051,7 +3046,6 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].Schedule_optional.announceTo := {f_getAnnouncementTargetPoA()};
- //f_CSE_DMR_CRE_BV_016(int18, v_createRequest, mw_createScheduleAnnc);//Schedule //@ACV
f_CSE_DMR_CRE_BV_016(int18, v_createRequest, mw_createScheduleAnncBase);//Schedule
}
@@ -3066,7 +3060,6 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- //f_cf01Up(); //@ACV
f_cf02Up();
// Test adapter configuration
@@ -3106,14 +3099,12 @@ module OneM2M_Testcases {
f_cse_postamble_deleteResources();
// Tear down
- //f_cf01Down(); //@ACV
f_cf02Down();
}//end f_CSE_DMR_CRE_BV_016
} // end g_CSE_DMR_CRE_BV_016
- //Start @ACV
group g_CSE_DMR_CRE_BV_017 {
testcase TC_CSE_DMR_CRE_BV_017_01() runs on CseTester system CseSystem {
@@ -3342,8 +3333,6 @@ module OneM2M_Testcases {
} // end g_CSE_DMR_CRE_BV_017
- //End @ACV
-
}//end group Create
group Retrieve {
@@ -4197,8 +4186,7 @@ module OneM2M_Testcases {
} // end f_CSE_DMR_RET_BO_008
- //@ACV
- group g_CSE_DMR_RET_BO_009{
+ group g_CSE_DMR_RET_BO_009{
testcase TC_CSE_DMR_RET_BO_009() runs on CseTester system CseSystem {
// Local variables
@@ -4251,7 +4239,6 @@ module OneM2M_Testcases {
} // end group g_CSE_DMR_RET_BO_009
- //@ACV
group g_CSE_DMR_RET_BV_010{
testcase TC_CSE_DMR_RET_BV_010() runs on CseTester system CseSystem {
@@ -4314,7 +4301,6 @@ module OneM2M_Testcases {
} // end group g_CSE_DMR_RET_BV_010
- //@ACV
group g_CSE_DMR_RET_BO_011{
testcase TC_CSE_DMR_RET_BO_011() runs on CseTester system CseSystem {
@@ -4368,8 +4354,7 @@ module OneM2M_Testcases {
} // end group g_CSE_DMR_RET_BO_011
- //@ACV
- group g_CSE_DMR_RET_BV_012{
+ group g_CSE_DMR_RET_BV_012{
testcase TC_CSE_DMR_RET_BV_012() runs on CseTester system CseSystem {
// Local variables
@@ -6734,7 +6719,6 @@ module OneM2M_Testcases {
} // end group g_CSE_DMR_UPD_BV_010
- //@ACV
group g_CSE_DMR_UPD_BV_011{
testcase TC_CSE_DMR_UPD_BV_011() runs on CseTester system CseSystem {
@@ -6796,8 +6780,7 @@ module OneM2M_Testcases {
} // end group g_CSE_DMR_UPD_BV_011
- //@ACV
- group g_CSE_DMR_UPD_BI_012{
+ group g_CSE_DMR_UPD_BI_012{
testcase TC_CSE_DMR_UPD_BI_012() runs on CseTester system CseSystem {
// Local variables
@@ -6860,8 +6843,7 @@ module OneM2M_Testcases {
} // end group g_CSE_DMR_UPD_BI_012
- //@ACV
- group g_CSE_DMR_UPD_BI_013{
+ group g_CSE_DMR_UPD_BI_013{
testcase TC_CSE_DMR_UPD_BI_013() runs on CseTester system CseSystem {
// Local variables
@@ -7731,7 +7713,6 @@ module OneM2M_Testcases {
}//end group Data_Management_and_Repository
- //@Martin
group Location {
group g_CSE_LOC_BV_001{