Moved to XSD v2.8.0

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent d446c288
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 169 2016-11-21 09:45:43Z reinaortega $
* $Id: OneM2M_Functions.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -494,8 +494,9 @@ module OneM2M_Functions {
{
accessControlOriginators := PX_ACOR, //{"admin:admin"}
accessControlOperations := valueof(p_allowedOperations),
accessControlContexts_list := omit,
accessControlAuthenticationFlag := omit
accessControlContexts_list := {},
accessControlAuthenticationFlag := omit,
accessControlObjectDetails_list := {}
}
};
......
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 167 2016-11-18 10:54:25Z reinaortega $
* $Id: OneM2M_Templates.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -108,7 +108,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
/**
......@@ -139,7 +139,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
/**
......@@ -170,7 +170,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
/**
......@@ -204,7 +204,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
}//end group Retrieve
......@@ -233,7 +233,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
/**
......@@ -358,7 +358,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
......@@ -391,11 +391,11 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenReqIndicator := *
tokenRequestIndicator := *
};
//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) XSD.NCName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
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 := "m_createAe" & f_rnd(1, 1000000),
resourceType := int2,
......@@ -648,7 +648,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
......@@ -675,7 +675,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
tokenReqIndicator := omit
tokenRequestIndicator := omit
};
......@@ -709,7 +709,7 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenReqIndicator := *
tokenRequestIndicator := *
};
/**
......@@ -738,7 +738,7 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenReqIndicator := *
tokenRequestIndicator := *
};
/**
......@@ -844,8 +844,9 @@ module OneM2M_Templates {
template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
accessControlOperations := p_allowedOperations,
accessControlContexts_list := omit,
accessControlAuthenticationFlag := omit
accessControlContexts_list := {},
accessControlAuthenticationFlag := omit,
accessControlObjectDetails_list := {}
}
//added by @Naum
......@@ -1012,7 +1013,7 @@ module OneM2M_Templates {
subscriberURI := p_subscriberURI//O
};
template (value) EventNotificationCriteria m_eventNotificationCriteria ( in NotificationEventType p_notificationEventType, in EventNotificationCriteria.attribute_list p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, in EventNotificationCriteria.attribute p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
createdBefore := omit,
createdAfter := omit,
modifiedSince := omit,
......@@ -1024,8 +1025,8 @@ module OneM2M_Templates {
sizeAbove := omit,
sizeBelow := omit,
operationMonitor_list := {},
attribute_list := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
notificationEventType_list := {p_notificationEventType},// TODO this list should be able to be omited see 9.6.8 (TS0001)
attribute := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
missingData := omit
};
......@@ -2033,7 +2034,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
tokenReqInfo := *
tokenRequestInformation := *
};
template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
......@@ -2048,7 +2049,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
tokenReqInfo := *
tokenRequestInformation := *
};
template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
......@@ -2063,7 +2064,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
tokenReqInfo := *
tokenRequestInformation := *
};
template ResponsePrimitive mw_responsePrimitiveKO := {
......@@ -2078,7 +2079,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
tokenReqInfo := *
tokenRequestInformation := *
};
group Notify{
......@@ -2095,7 +2096,7 @@ module OneM2M_Templates {
contentStatus := omit,
contentOffset := omit,
assignedTokenIdentifiers := omit,
tokenReqInfo := omit
tokenRequestInformation := omit
};
}
......
This diff is collapsed.
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 169 2016-11-21 09:45:43Z reinaortega $
* $Id: OneM2M_Testcases.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -22,7 +22,7 @@ module OneM2M_Testcases {
import from OneM2M_Pixits all;
import from OneM2M_Pics all;
import from OneM2M_Functions all;
import from LibCommon_Time {modulepar all};
import from LibCommon_Time all;
import from XSD all;
......@@ -1371,7 +1371,7 @@ module OneM2M_Testcases {
// Preamble
for (i := 0; i<v_sizeResourceTypeList; i := i+1){
if(match(p_requestPrimitiveList[i].resourceType, int23)){
if(match(int23, p_requestPrimitiveList[i].resourceType)){
v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred
p_requestPrimitiveList[i].primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_parentIndex)));
......@@ -3355,8 +3355,9 @@ module OneM2M_Testcases {
{
accessControlOriginators := {"admin:admin"},
accessControlOperations := int61,
accessControlContexts_list := omit,
accessControlAuthenticationFlag := omit
accessControlContexts_list := {},
accessControlAuthenticationFlag := omit,
accessControlObjectDetails_list := {}
}
}
}
......@@ -7646,7 +7647,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int3)); // TODO this field is initialised 2 time with parent adress resource (here and in f_cse_createResource)
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}, -)); // TODO this field is initialised 2 time with parent adress resource (here and in f_cse_createResource)
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
......@@ -7713,7 +7714,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int2));
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -));
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
......@@ -7817,7 +7818,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int4));
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -));
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted)
......@@ -8174,7 +8175,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
var Attribute v_attribute := {"labels",{omit,omit,{"VALUE_1"}}};// TODO normaly value isn't expected
var AttributeList_1 v_attributeList := {"labels"};
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
......@@ -8199,7 +8200,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int1, {v_attribute}));
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList));
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
......@@ -8246,7 +8247,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
var Attribute v_attribute := {"appName",{omit,omit,{"VALUE_1"}}}; // TODO normaly value isn't expected
var AttributeList_1 v_attributeList := {"appName"};
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
......@@ -8269,7 +8270,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int1, {v_attribute}));
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList));
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment