Adaptation to xsd_1_6_0

parent bd221859
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 23 2016-03-17 10:02:44Z reinaortega $
* $Id: OneM2M_Functions.ttcn 43 2016-04-13 12:16:12Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -52,7 +52,7 @@ module OneM2M_Functions {
var XSD.ID v_acpId;
v_acpId := f_createAccessControlPolicyAux("MyAcp", p_allowedOperations);
v_acpId := f_createAccessControlPolicyAux(p_allowedOperations);
mcaPort.send(m_request(m_createAeAux(p_name, {v_acpId})));
tc_ac.start;
......@@ -60,8 +60,8 @@ module OneM2M_Functions {
[] mcaPort.receive(mw_responseOK) -> value v_response {
tc_ac.stop;
log("Preamble: Application registered successfuly");
if(ischosen(v_response.responsePrimitive_.content.any_1[0].AE)) {
vc_ae := v_response.responsePrimitive_.content.any_1[0].AE;
if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE)) {
vc_ae := v_response.responsePrimitive_.primitiveContent.any_1[0].AE;
}
}
[] mcaPort.receive(mw_responseKO) {
......@@ -157,19 +157,19 @@ module OneM2M_Functions {
group getSetFunctions {
function f_getCreateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_name, in template (omit) AccessControlOperations p_allowedOperations, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
function f_getCreateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_aeResourceAddress, in template (omit) AccessControlOperations p_allowedOperations, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
p_request.to_ := p_aeResourceAddress;
p_request.name := p_name;
//p_request.name := p_name;
if (p_resourceType == int1) {//AccessControlPolicy
if(isvalue(p_allowedOperations)){
p_request.content.any_1[0].ACP_create := valueof(m_contentCreateAcp (p_allowedOperations));
p_request.primitiveContent.any_1[0].ACP_create := valueof(m_contentCreateAcp (c_defaultResourceName, p_allowedOperations));
}
}
if (p_resourceType == int9) {//group
p_request.content.any_1[0].Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & vc_ae.resourceID}, omit);
p_request.primitiveContent.any_1[0].Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & vc_ae.resourceID}, omit);
}
if (p_resourceType == int15) {//pollingChannel
......@@ -179,10 +179,10 @@ module OneM2M_Functions {
return valueof(p_request);
}
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_resourceAddress, in template (omit) XSD.String p_name, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, XSD.ID p_resourceAddress, template RequestPrimitive p_request) runs on M2M return RequestPrimitive {
p_request.to_ := p_resourceAddress;
p_request.name := p_name;
//p_request.name := p_name;
if (p_resourceType == int3) {//Container
......@@ -223,12 +223,12 @@ module OneM2M_Functions {
group helpingFunctions {
function f_createResource(in ResourceType p_resourceType, XSD.ID p_parentResourceAddress, XSD.String p_resourceName, template RequestPrimitive p_requestPrimitive) runs on M2M {
function f_createResource(in ResourceType p_resourceType, XSD.ID p_parentResourceAddress, template RequestPrimitive p_requestPrimitive) runs on M2M {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
v_request := f_getCreateRequestPrimitive(p_resourceType,p_parentResourceAddress,p_resourceName, omit, p_requestPrimitive);
v_request := f_getCreateRequestPrimitive(p_resourceType,p_parentResourceAddress, omit, p_requestPrimitive);
mcaPort.send(m_request(v_request));
tc_ac.start;
......@@ -252,19 +252,19 @@ module OneM2M_Functions {
}
function f_createAccessControlPolicyAux(XSD.String p_resourceName, in template (value) AccessControlOperations p_allowedOperations) runs on M2M return XSD.ID{
function f_createAccessControlPolicyAux(in template (value) AccessControlOperations p_allowedOperations) runs on M2M return XSD.ID{
var M2MResponsePrimitive v_response;
var XSD.ID v_acpId;
mcaPort.send(m_request(m_createAcpAux(p_resourceName,p_allowedOperations)));
mcaPort.send(m_request(m_createAcpAux(p_allowedOperations)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) -> value v_response {
tc_ac.stop;
setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly");
v_acpId := f_getResourceId(v_response.responsePrimitive_.content);
return v_acpId;//TODO: Retrieve resourceId from v_response.responsePrimitive_.content_.any_1.accessControlPolicy.resourceID;
v_acpId := f_getResourceId(v_response.responsePrimitive_.primitiveContent);
return v_acpId;
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
......
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 23 2016-03-17 10:02:44Z reinaortega $
* $Id: OneM2M_Pixits.ttcn 39 2016-04-08 12:34:02Z berge $
* @desc Module containing Pixits for oneM2M
*
*/
......@@ -35,4 +35,8 @@ module OneM2M_Pixits {
modulepar boolean PX_RUN_POSTAMBLE := true;
modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
} // end of module
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 24 2016-03-17 13:30:50Z berge $
* $Id: OneM2M_Templates.ttcn 43 2016-04-13 12:16:12Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -30,8 +30,8 @@ module OneM2M_Templates {
requestPrimitive_ := p_requestPrimitive,
host := PX_HOST_ADDRESS,
xmlNamespace := PX_XML_NAMESPACE,
protocolBinding := omit,
serialization := omit
protocolBinding := PX_PROTOCOL_BINDING,
serialization := PX_SERIALIZATION
};
......@@ -48,8 +48,8 @@ module OneM2M_Templates {
from_ := "admin:admin",
requestIdentifier := "m_retrieveCseBase",
resourceType := int5,
name := omit,
content := omit,
primitiveContent := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -70,8 +70,8 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_retrieveResource",
resourceType := p_resourceType,
name := omit,
content := omit,
primitiveContent := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -92,8 +92,8 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_retrieveResourceAttributeOptionTo",
resourceType := p_resourceType,
name := omit,
content := omit,
primitiveContent := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -114,10 +114,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_retrieveResourceAttributeContentOption",
resourceType := p_resourceType,
name := omit,
content := {
any_1 := {{AttributeList_1 := p_attributeList}}
primitiveContent := {
any_1 := {{AttributeList := p_attributeList}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -134,16 +134,16 @@ module OneM2M_Templates {
}//end group Retrieve
group Update {
template (value) RequestPrimitive m_updateContentInstance(XSD.ID p_targetResourceAddress, XSD.String p_content) := {
template (value) RequestPrimitive m_updateContentInstance(XSD.ID p_targetResourceAddress, XSD.String p_primitiveContent) := {
operation := int3,
to_ := p_targetResourceAddress,
from_ := "admin:admin",
requestIdentifier := "m_updateContentInstance",
resourceType := int4,
name := omit,
content := {
any_1 := {{ContentInstance_update := m_contentUpdateContentInstance(p_content)}}
primitiveContent := {
any_1 := {{ContentInstance_update := m_contentUpdateContentInstance(p_primitiveContent)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -164,10 +164,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateContainer",
resourceType := int1,
name := "NotInitialized",
content:= {
primitiveContent:= {
any_1 := {{Container_update := m_contentUpdateContainer}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -188,10 +188,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateContainer",
resourceType := int1,
name := p_resourceName,
content:= {
primitiveContent:= {
any_1 := {{Container_update := m_contentUpdateContainer}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -213,10 +213,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateAcp",
resourceType := int1,
name := "NotInitialized",
content:= {
primitiveContent:= {
any_1 := {{ACP_update := m_contentUpdateAcp}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -238,10 +238,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateGroup",
resourceType := int1,
name := "NotInitialized",
content:= {
primitiveContent:= {
any_1 := {{Group_update := m_contentUpdateGroup}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -263,10 +263,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateSchedule",
resourceType := int1,
name := "NotInitialized",
content:= {
primitiveContent:= {
any_1 := {{Schedule_update := m_contentUpdateSchedule}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -288,10 +288,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updatePollingChannel",
resourceType := int1,
name := "NotInitialized",
content:= {
primitiveContent:= {
any_1 := {{PollingChannel_update := m_contentUpdatePollingChannel}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -313,10 +313,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateSubscription",
resourceType := int1,
name := "NotInitialized",
content:= {
primitiveContent:= {
any_1 := {{Subscription_update := m_contentUpdateSubscription}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -342,7 +342,7 @@ module OneM2M_Templates {
requestIdentifier := "m_createContainer",
resourceType := int3,
name := omit,
content := {
primitiveContent := {
{
m_contentContainer
}
......@@ -350,16 +350,16 @@ module OneM2M_Templates {
discoveryResultType := omit
};*/
/*template (value) requestPrimitive m_createResource_noName(XSD.ID p_resourceId, ResourceType p_resourceType, template (value) primitiveContent p_content) := {
/*template (value) requestPrimitive m_createResource_noName(XSD.ID p_resourceId, ResourceType p_resourceType, template (value) primitiveContent p_primitiveContent) := {
operation := int1,
to_ := p_resourceId,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createResource",
resourceType := p_resourceType,
name := omit,
content := {
primitiveContent := {
{
p_content
p_primitiveContent
}
},
discoveryResultType := omit
......@@ -371,10 +371,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createAe",
resourceType := int2,
name := p_name,
content := {
any_1 := {{AE_create := m_contentCreateAe(p_accessControlPolicyIDs)}}
primitiveContent := {
any_1 := {{AE_create := m_contentCreateAe(p_name, p_accessControlPolicyIDs)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -396,10 +396,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createAcp",
resourceType := int1,
name := "NotInitialized",
content := {
any_1 := {{ACP_create := m_contentCreateAcp (int63)}}
primitiveContent := {
any_1 := {{ACP_create := m_contentCreateAcp (omit, int63)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -421,10 +421,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createAcp",
resourceType := int1,
name := p_name,
content := {
any_1 := {{ACP_create := m_contentCreateAcp (p_allowedOperations)}}
primitiveContent := {
any_1 := {{ACP_create := m_contentCreateAcp (omit, p_allowedOperations)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -440,16 +440,16 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_name, in template (value) AccessControlOperations p_allowedOperations ) := {
template (value) RequestPrimitive m_createAcpAux(in template (value) AccessControlOperations p_allowedOperations ) := {
operation := int1,
to_ := PX_URI_CSE & PX_CSE_NAME,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createAcp",
resourceType := int1,
name := p_name,
content := {
any_1 := {{ACP_create := m_contentCreateAcp (p_allowedOperations)}}
primitiveContent := {
any_1 := {{ACP_create := m_contentCreateAcp ("MyAcp", p_allowedOperations)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -471,10 +471,11 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createContainer",
resourceType := int3,
name := "NotInitialized",
content := {
primitiveContent := {
any_1 := {{Container_create := m_contentCreateContainer}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -496,10 +497,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createContainer",
resourceType := int3,
name := p_resourceName,
content := {
primitiveContent := {
any_1 := {{Container_create := m_contentCreateContainer}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -515,16 +516,16 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createContentInstance(XSD.ID p_resourceId, XSD.String p_content) := {
template (value) RequestPrimitive m_createContentInstance(XSD.ID p_resourceId, XSD.String p_primitiveContent) := {
operation := int1,
to_ := p_resourceId,
from_ := "admin:admin",
requestIdentifier := "m_createContentInstance",
resourceType := int4,
name := "myContent",
content := {
any_1 := {{ContentInstance_create := m_contentCreateContentInstance(p_content)}}
primitiveContent := {
any_1 := {{ContentInstance_create := m_contentCreateContentInstance(p_primitiveContent)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -541,15 +542,15 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createGroupBase := {
operation := int1,
to_ := "NotInitialized",
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createGroup",
resourceType := int9,
name := "NotInitialized",
content := {
any_1 := {{Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & "NotInitialized"}, omit)}} //TODO: p_resourceId
},
operation := int1,
to_ := "NotInitialized",
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createGroup",
resourceType := int9,
primitiveContent := {
any_1 := {{Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & "NotInitialized"}, omit)}} //TODO: p_resourceId
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -571,10 +572,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createGroup",
resourceType := int9,
name := p_name,
content := {
primitiveContent := {
any_1 := {{Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & valueof(p_memberId)}, p_accessControlPolicyIDs)}} //TODO: p_resourceId
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -591,15 +592,15 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createPollingChannelBase := {
operation := int1,
to_ := "NotInitialized",
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createPollingChannel",
resourceType := int15,
name := "NotInitialized",
content := {
any_1 := {{PollingChannel_create := m_contentCreatePollingChannel (omit)}}
},
operation := int1,
to_ := "NotInitialized",
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createPollingChannel",
resourceType := int15,
primitiveContent := {
any_1 := {{PollingChannel_create := m_contentCreatePollingChannel (omit)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -615,16 +616,16 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_aeResourceAddress, in template (value)XSD.ID p_originatorId, in template (omit) XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIDs ) := {
template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_aeResourceAddress, in template (value)XSD.ID p_originatorId, in template (omit) AcpType p_accessControlPolicyIDs ) := {
operation := int1,
to_ := p_aeResourceAddress,
from_ := p_originatorId,
requestIdentifier := "m_createPollingChannel",
resourceType := int15,
name := p_name,
content := {
primitiveContent := {
any_1 := {{PollingChannel_create := m_contentCreatePollingChannel (p_accessControlPolicyIDs)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -648,10 +649,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createSchedule",
resourceType := int18,
name := "NotInitialized",
content := {
primitiveContent := {
any_1 := {{Schedule_create := m_contentCreateSchedule ({{"0,0,0 1 2,1,1,*"}})}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -673,10 +674,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createSchedule",
resourceType := int18,
name := p_name,
content := {
primitiveContent := {
any_1 := {{Schedule_create := m_contentCreateSchedule (p_scheduleElement)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -698,10 +699,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createSubscription",
resourceType := int23,
name := "NotInitialized",
content := {
primitiveContent := {
any_1 := {{Subscription_create := m_contentCreateSubscription ({"/in-cse/ae_test"})}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -723,10 +724,10 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createSubscription",
resourceType := int23,
name := p_name,
content := {
primitiveContent := {
any_1 := {{Subscription_create := m_contentCreateSubscription (p_notificationURI)}}
},
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -751,8 +752,8 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_deleteAe",
resourceType := omit,
name := omit,
content := omit,
primitiveContent := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -774,8 +775,8 @@ module OneM2M_Templates {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_deleteAcp",
resourceType := omit,
name := omit,
content := omit,
primitiveContent := omit,
role := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -795,7 +796,8 @@ module OneM2M_Templates {
group ContentCreate {
template (value) AE_create m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIDs) := {
template (value) AE_create m_contentCreateAe (in template (omit) XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIDs) := {
resourceName := p_name,
labels := omit,
accessControlPolicyIDs := p_accessControlPolicyIDs,
expirationTime := omit,
......@@ -808,7 +810,8 @@ module OneM2M_Templates {
requestReachability := false
};
template (value) ACP_create m_contentCreateAcp (in template (value) AccessControlOperations p_allowedOperations ) := {
template (value) ACP_create m_contentCreateAcp (in template (omit) XSD.String p_name, in template (value) AccessControlOperations p_allowedOperations ) := {
resourceName := p_name,
labels := omit,
expirationTime := omit,
announceTo := omit,
......@@ -836,6 +839,7 @@ module OneM2M_Templates {
template (value) Group_create m_contentCreateGroup ( in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
in template (value) ListOfURIs p_memberIds,
in template (omit) AcpType p_accessControlPolicyIDs) := {
resourceName := c_defaultResourceName,
labels := omit,
accessControlPolicyIDs := p_accessControlPolicyIDs,
expirationTime := omit,
......@@ -851,6 +855,7 @@ module OneM2M_Templates {
};
template (value) PollingChannel_create m_contentCreatePollingChannel ( in template (omit) AcpType p_accessControlPolicyIDs) := {
resourceName := c_defaultResourceName,
labels := omit,
accessControlPolicyIDs := p_accessControlPolicyIDs,
expirationTime := omit,
......@@ -858,6 +863,7 @@ module OneM2M_Templates {
};
template (value) Schedule_create m_contentCreateSchedule (in template (value) ScheduleEntries p_scheduleElement) := {
resourceName := c_defaultResourceName,
labels := omit,
expirationTime := omit,
announceTo := omit,
......@@ -866,6 +872,7 @@ module OneM2M_Templates {
};
template (value) Subscription_create m_contentCreateSubscription (in template (value) ListOfURIs p_notificationURI) := {
resourceName := c_defaultResourceName,
labels := omit,
accessControlPolicyIDs := omit,
expirationTime := omit,
......@@ -886,21 +893,23 @@ module OneM2M_Templates {
subscriberURI := omit
};
template (value) ContentInstance_create m_contentCreateContentInstance(XSD.String p_content) := {
template (value) ContentInstance_create m_contentCreateContentInstance(XSD.String p_primitiveContent) := {
resourceName := c_defaultResourceName,
labels := omit,
announceTo := omit,
contentInfo := "a",
contentSize := omit,
ontologyRef := omit,
content_ := {
embed_values := {p_content},
embed_values := {p_primitiveContent},
attr := omit,
elem_list := {}
}
};
template (value) Container_create m_contentCreateContainer := {
labels := omit,
resourceName := c_defaultResourceName,
labels := omit,
accessControlPolicyIDs := omit,
expirationTime := omit,
announceTo := omit,
......@@ -982,14 +991,14 @@ module OneM2M_Templates {
notificationEventCat := omit
};
template (value) ContentInstance_update m_contentUpdateContentInstance(XSD.String p_content) := {
template (value) ContentInstance_update m_contentUpdateContentInstance(XSD.String p_primitiveContent) := {
labels := omit,
announceTo := omit,
contentInfo := omit,
contentSize := omit,
ontologyRef := omit,
content_ := {
embed_values := {p_content},
embed_values := {p_primitiveContent},
attr := omit,
elem_list := {}
}
......@@ -1011,20 +1020,7 @@ module OneM2M_Templates {
group SpecialContents {
template (value) AttributeList_1 m_contentAttributeList (in template (value) Attribute p_attribute) := {
attribute_list := {
p_attribute
}
};
template (value) AttributeList_1 m_contentAttributeList_2( in template (value) Attribute p_attribute1,
in template (value) Attribute p_attribute2) := {
attribute_list := {
p_attribute1,
p_attribute2
}
};
}//end gropu SpecialContents
group ResponsePrimitives {
......@@ -1032,7 +1028,7 @@ module OneM2M_Templates {
responsePrimitive_ := {
responseStatusCode := p_statusCode,
requestIdentifier := ?,
content := *,
primitiveContent := *,
to_ := *,
from_ := *,
originatingTimestamp := *,
......@@ -1045,7 +1041,7 @@ module OneM2M_Templates {
responsePrimitive_ := {
responseStatusCode := (int2000, int2001, int2002, int2004),
requestIdentifier := ?,
content := *,
primitiveContent := *,
to_ := *,
from_ := *,
originatingTimestamp := *,
......@@ -1058,7 +1054,7 @@ module OneM2M_Templates {
responsePrimitive_ := {
responseStatusCode := complement(int2000, int2001, int2002, int2004),
requestIdentifier := ?,
content := *,
primitiveContent := *,
to_ := *,
from_ := *,
originatingTimestamp := *,
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 24 2016-03-17 13:30:50Z berge $
* $Id: OneM2M_Testcases.ttcn 43 2016-04-13 12:16:12Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -328,39 +328,57 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_CRE_BV_001_01() runs on M2M system M2MSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
v_createRequest.primitiveContent.any_1[0].Container_create.resourceName := omit;
f_CSE_DMR_CRE_BV_001(int3, m_createContainerBase);//Container
}
testcase TC_CSE_DMR_CRE_BV_001_02() runs on M2M system M2MSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createGroupBase;
v_createRequest.primitiveContent.any_1[0].Group_create.resourceName := omit;
f_CSE_DMR_CRE_BV_001(int9, m_createGroupBase);//Group
}
testcase TC_CSE_DMR_CRE_BV_001_03() runs on M2M system M2MSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createAcpBase;
v_createRequest.primitiveContent.any_1[0].ACP_create.resourceName := omit;
f_CSE_DMR_CRE_BV_001(int1, m_createAcpBase);//AccessControlPolicy
}
testcase TC_CSE_DMR_CRE_BV_001_04() runs on M2M system M2MSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createScheduleBase;
v_createRequest.primitiveContent.any_1[0].Schedule_create.resourceName := omit;
f_CSE_DMR_CRE_BV_001(int18, m_createScheduleBase);//Schedule
}
testcase TC_CSE_DMR_CRE_BV_001_05() runs on M2M system M2MSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
v_createRequest.primitiveContent.any_1[0].PollingChannel_create.resourceName := omit;
f_CSE_DMR_CRE_BV_001(int15, m_createPollingChannelBase);//PollingChannel
}
testcase TC_CSE_DMR_CRE_BV_001_06() runs on M2M system M2MSystem {
// Local variables
f_CSE_DMR_CRE_BV_001(int23, m_createSubscriptionBase);//Subscription
}
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
v_createRequest.primitiveContent.any_1[0].Subscription_create.resourceName := omit;
f_CSE_DMR_CRE_BV_001(int23, m_createSubscriptionBase);//Subscription
}