Skip to content

GitLab

Commit 819d9632 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

TST-2016-0082-TS-0019_TTCN-3_Test_cases

parent c574a0f5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2938 additions and 733 deletions
OneM2M_Functions.ttcn
View file @ 819d9632
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 43 2016-04-13 12:16:12Z reinaortega $
* $Id: OneM2M_Functions.ttcn 76 2016-04-29 14:15:01Z berge $
* @desc Module containing functions for oneM2M
*
*/
......@@ -33,6 +33,7 @@ module OneM2M_Functions {
// Map
map(self:mcaPort, system:mcaPort);
map(self:acPort, system:acPort);
activate(a_default());
// Connect
......@@ -52,7 +53,7 @@ module OneM2M_Functions {
var XSD.ID v_acpId;
v_acpId := f_createAccessControlPolicyAux(p_allowedOperations);
v_acpId := f_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
mcaPort.send(m_request(m_createAeAux(p_name, {v_acpId})));
tc_ac.start;
......@@ -62,6 +63,7 @@ module OneM2M_Functions {
log("Preamble: Application registered successfuly");
if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE)) {
vc_ae := v_response.responsePrimitive_.primitiveContent.any_1[0].AE;
f_sendAcPrimitive("AE-ID_changed", vc_ae.aE_ID);
}
}
[] mcaPort.receive(mw_responseKO) {
......@@ -91,7 +93,7 @@ module OneM2M_Functions {
var M2MResponsePrimitive v_response;
if (PX_RUN_POSTAMBLE) {
mcaPort.send(m_request(m_deleteAe("/" & PX_CSE_NAME & "/" & valueof(p_aeName))));
mcaPort.send(m_request(m_deleteAe(PX_URI_CSE & PX_CSE_NAME & "/" & valueof(p_aeName))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) {
......@@ -107,7 +109,7 @@ module OneM2M_Functions {
}
}
mcaPort.send(m_request(m_deleteAcp("/" & PX_CSE_NAME & "/MyAcp")));
mcaPort.send(m_request(m_deleteAcp(PX_URI_CSE & PX_CSE_NAME & "/MyAcp")));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) {
......@@ -122,6 +124,8 @@ module OneM2M_Functions {
log("Postamble: No answer while deleting resource");
}
}
}
f_postamble_default();
......@@ -130,7 +134,8 @@ module OneM2M_Functions {
function f_postamble_default() runs on M2M {
unmap(self:mcaPort, system:mcaPort);
stop;
unmap(self:acPort, system:acPort);
//stop;
}
}//end group postambleFunctions
......@@ -164,9 +169,6 @@ module OneM2M_Functions {
if (p_resourceType == int1) {//AccessControlPolicy
if(isvalue(p_allowedOperations)){
p_request.primitiveContent.any_1[0].ACP_create := valueof(m_contentCreateAcp (c_defaultResourceName, p_allowedOperations));
}
}
if (p_resourceType == int9) {//group
p_request.primitiveContent.any_1[0].Group_create := m_contentCreateGroup (1, {"/" & PX_CSE_NAME & "/" & vc_ae.resourceID}, omit);
......@@ -218,12 +220,25 @@ module OneM2M_Functions {
return "1";
}
function f_getAttribute(in MyAttributeList p_attributeList, in XSD.NCName p_attributeName) return Attribute {
var integer i;
var Attribute v_attribute := {-, -};
for (i:=0; i < lengthof(p_attributeList); i := i + 1){
if(p_attributeList[i].name == p_attributeName){
}
}
return v_attribute;
}
}//end group getSetFunctions
group helpingFunctions {
function f_createResource(in ResourceType p_resourceType, XSD.ID p_parentResourceAddress, 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 return RequestPrimitive {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
......@@ -249,39 +264,100 @@ module OneM2M_Functions {
setverdict(inconc, "f_createResource: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
}
}
return v_request;
}
function f_createAccessControlPolicyAux(in template (value) AccessControlOperations p_allowedOperations) runs on M2M return XSD.ID{
function f_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := "MyAcp", in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return XSD.ID{
var M2MResponsePrimitive v_response;
var XSD.ID v_acpId;
mcaPort.send(m_request(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := 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_.primitiveContent);
return v_acpId;
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1));
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1));
}
}
var M2MResponsePrimitive v_response;
var XSD.ID v_acpId;
return "0";
}
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_.primitiveContent);
return v_acpId;
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1));
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1));
}
}
return "0";
function f_createContainerResourceAux (XSD.ID p_parentResourceAddress) runs on M2M return RequestPrimitive {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
var XSD.ID v_acpId;
v_acpId := f_createAccessControlPolicyAux(p_acpName := "MyAcp_2");
v_request := valueof(m_createContainerBase);
v_request.primitiveContent.any_1[0].Container_create.accessControlPolicyIDs := {v_acpId};
v_request.primitiveContent.any_1[0].Container_create.resourceName := "MyContainerAux";
f_createResource(int3, p_parentResourceAddress, v_request );
return v_request;
}
}
function f_updateAcpAuxResource (XSD.ID p_acpAddress, in template (value) AccessControlOperations p_allowedOperations) runs on M2M {
var RequestPrimitive v_request;
v_request := valueof(m_updateAcpBase);
v_request.to_ := p_acpAddress;
v_request.primitiveContent.any_1[0].ACP_update.privileges.accessControlRule_list := {
{
accessControlOriginators := {"admin:admin"},
accessControlOperations := p_allowedOperations,
accessControlContexts_list := omit
}
};
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_responseOK) {
tc_ac.stop;
setverdict(pass, "f_updateAcpAuxResource: " & p_acpAddress & " resource updated successfuly");
//TODO: Check that name attribute is provided
}
[] mcaPort.receive(mw_responseKO) {
tc_ac.stop;
setverdict(fail, "f_updateAcpAuxResource: Error while updating " & p_acpAddress & " resource");
}
[] tc_ac.timeout {
setverdict(inconc, "f_updateAcpAuxResource: No answer while updating " & p_acpAddress & " resource" );
}
}
}
function f_sendAcPrimitive(in charstring event, in charstring data) runs on M2M {
var charstring v_data := "" & data; // clear encoding rules (ttwb issue ?)
acPort.send(AcRequestPrimitive:{event, {charstring := v_data}});
}
}//end group helpingFunctions
......
OneM2M_Pixits.ttcn
View file @ 819d9632
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 39 2016-04-08 12:34:02Z berge $
* $Id: OneM2M_Pixits.ttcn 49 2016-04-25 08:29:23Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
......@@ -35,7 +35,7 @@ module OneM2M_Pixits {
modulepar boolean PX_RUN_POSTAMBLE := true;
modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_SERIALIZATION := "JSON";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
......
OneM2M_Templates.ttcn
View file @ 819d9632
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 43 2016-04-13 12:16:12Z reinaortega $
* $Id: OneM2M_Templates.ttcn 69 2016-04-28 07:49:58Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -26,12 +26,13 @@ module OneM2M_Templates {
* @desc
* @param p_requestPrimitive
*/
template (value) M2MRequestPrimitive m_request(in template (value) RequestPrimitive p_requestPrimitive ) := {
template (value) M2MRequestPrimitive m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := {
requestPrimitive_ := p_requestPrimitive,
host := PX_HOST_ADDRESS,
xmlNamespace := PX_XML_NAMESPACE,
protocolBinding := PX_PROTOCOL_BINDING,
serialization := PX_SERIALIZATION
serialization := PX_SERIALIZATION,
nullFields := p_nullFields
};
......@@ -397,7 +398,7 @@ module OneM2M_Templates {
requestIdentifier := "m_createAcp",
resourceType := int1,
primitiveContent := {
any_1 := {{ACP_create := m_contentCreateAcp (omit, int63)}}
any_1 := {{ACP_create := m_contentCreateAcp ()}}
},
role := omit,
originatingTimestamp := omit,
......@@ -415,14 +416,14 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createAcp(XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_name, in template (value) AccessControlOperations p_allowedOperations ) := {
template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultResourceName, in template (value) AccessControlOperations p_allowedOperations := int63) := {
operation := int1,
to_ := p_aeResourceAddress,
to_ := p_parentResourceAddress,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createAcp",
resourceType := int1,
primitiveContent := {
any_1 := {{ACP_create := m_contentCreateAcp (omit, p_allowedOperations)}}
any_1 := {{ACP_create := m_contentCreateAcp (p_name, p_allowedOperations)}}
},
role := omit,
originatingTimestamp := omit,
......@@ -440,14 +441,14 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createAcpAux(in template (value) AccessControlOperations p_allowedOperations ) := {
template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_acpName := "MyAcp", in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
operation := int1,
to_ := PX_URI_CSE & PX_CSE_NAME,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createAcp",
resourceType := int1,
primitiveContent := {
any_1 := {{ACP_create := m_contentCreateAcp ("MyAcp", p_allowedOperations)}}
any_1 := {{ACP_create := m_contentCreateAcp (p_acpName, p_allowedOperations)}}
},
role := omit,
originatingTimestamp := omit,
......@@ -491,9 +492,9 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createContainer(XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_resourceName) := {
template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName) := {
operation := int1,
to_ := p_aeResourceAddress,
to_ := p_parentResourceAddress,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createContainer",
resourceType := int3,
......@@ -516,9 +517,9 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createContentInstance(XSD.ID p_resourceId, XSD.String p_primitiveContent) := {
template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) := {
operation := int1,
to_ := p_resourceId,
to_ := p_parentResourceAddress,
from_ := "admin:admin",
requestIdentifier := "m_createContentInstance",
resourceType := int4,
......@@ -566,9 +567,9 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createGroup(XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIDs, in template (value) XSD.AnyURI p_memberId ) := {
template (value) RequestPrimitive m_createGroup(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (omit) AcpType p_accessControlPolicyIDs, in template (value) XSD.AnyURI p_memberId ) := {
operation := int1,
to_ := p_aeResourceAddress,
to_ := p_parentResourceAddress,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createGroup",
resourceType := int9,
......@@ -616,9 +617,9 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_aeResourceAddress, in template (value)XSD.ID p_originatorId, in template (omit) AcpType p_accessControlPolicyIDs ) := {
template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId, in template (omit) AcpType p_accessControlPolicyIDs ) := {
operation := int1,
to_ := p_aeResourceAddress,
to_ := p_parentResourceAddress,
from_ := p_originatorId,
requestIdentifier := "m_createPollingChannel",
resourceType := int15,
......@@ -668,9 +669,9 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) := {
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) := {
operation := int1,
to_ := p_aeResourceAddress,
to_ := p_parentResourceAddress,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createSchedule",
resourceType := int18,
......@@ -718,9 +719,9 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createSubscription(XSD.ID p_aeResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI ) := {
template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI ) := {
operation := int1,
to_ := p_aeResourceAddress,
to_ := p_parentResourceAddress,
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createSubscription",
resourceType := int23,
......@@ -810,7 +811,7 @@ module OneM2M_Templates {
requestReachability := false
};
template (value) ACP_create m_contentCreateAcp (in template (omit) XSD.String p_name, in template (value) AccessControlOperations p_allowedOperations ) := {
template (value) ACP_create m_contentCreateAcp (in template (omit) XSD.String p_name := c_defaultResourceName, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
resourceName := p_name,
labels := omit,
expirationTime := omit,
......@@ -1017,11 +1018,425 @@ module OneM2M_Templates {
ontologyRef := omit
};
}//end group ContentUpdate
group responseContent {
template AE mw_contentAeBase := {
resourceName := ?,
resourceType := ?,
resourceID := ?,
parentID := ?,
creationTime := ?,
lastModifiedTime := ?,
labels := *,
accessControlPolicyIDs := *,
expirationTime := ?,
announceTo := *,
announcedAttribute := ?,
appName := *,
app_ID := ?,
aE_ID := ?,
pointOfAccess := *,
ontologyRef := *,
nodeLink := *,
requestReachability := ?,
contentSerialization := *,
choice := *
};
template AccessControlPolicy mw_contentAcpBase := {
resourceName := ?,
resourceType := ?,
resourceID := ?,
parentID := ?,
creationTime := ?,
lastModifiedTime := ?,
labels := *,
expirationTime := ?,
announceTo := *,
announcedAttribute := ?,
privileges := ?,
selfPrivileges := ?,
choice := *
};
template AccessControlPolicy mw_contentAcp_rc1 modifies mw_contentAcpBase := {
choice := omit
}
//TODO
template AccessControlPolicy mw_contentAcp_rc2 modifies mw_contentAcpBase := {
choice := omit
}
template AccessControlPolicy mw_contentAcp_rc3 modifies mw_contentAcpBase := {
choice := omit
}
template AccessControlPolicy mw_contentAcp_rc4 modifies mw_contentAcpBase := {
choice := omit
}
template AccessControlPolicy mw_contentAcp_rc5 modifies mw_contentAcpBase := {
choice := omit
}
template AccessControlPolicy mw_contentAcp_rc6 modifies mw_contentAcpBase := {
choice := omit
}
template AccessControlPolicy mw_contentAcp_rc7 modifies mw_contentAcpBase := {
choice := omit
}
template Group mw_contentGroupBase := {
resourceName := ?,
resourceType := ?,
resourceID := ?,
parentID := ?,
creationTime := ?,
lastModifiedTime := ?,
labels := *,
accessControlPolicyIDs := *,
expirationTime := ?,
announceTo := *,
announcedAttribute := ?,
creator := *,
memberType := ?,
currentNrOfMembers := ?,
maxNrOfMembers := ?,
memberIDs := ?,
membersAccessControlPolicyIDs := *,
memberTypeValidated := ?,
consistencyStrategy := *,
groupName := *,
fanOutPoint := ?,
choice := *
};
template Group mw_contentGroup_rc1 modifies mw_contentGroupBase := {
choice := omit
}
template Group mw_contentGroup_rc2 modifies mw_contentGroupBase := {
choice := omit
}
template Group mw_contentGroup_rc3 modifies mw_contentGroupBase := {
choice := omit
}
template Group mw_contentGroup_rc4 modifies mw_contentGroupBase := {
choice := omit
}
template Group mw_contentGroup_rc5 modifies mw_contentGroupBase := {
choice := omit
}
template Group mw_contentGroup_rc6 modifies mw_contentGroupBase := {
choice := omit
}
template Group mw_contentGroup_rc7 modifies mw_contentGroupBase := {
choice := omit
}
template PollingChannel mw_contentPollingChannelBase := {
resourceName := ?,
resourceType := ?,
resourceID := ?,
parentID := ?,
creationTime := ?,
lastModifiedTime := ?,
labels := *,
accessControlPolicyIDs := *,
expirationTime := ?,
pollingChannelURI := ?
};
template Schedule mw_contentScheduleBase := {
resourceName := ?,
resourceType := ?,
resourceID := ?,
parentID := ?,
creationTime := ?,
lastModifiedTime := ?,
labels := *,
expirationTime := ?,
announceTo := *,
announcedAttribute := ?,
scheduleElement := ?,
choice := *
};
template Schedule mw_contentSchedule_rc1 modifies mw_contentScheduleBase := {
choice := omit
}
template Schedule mw_contentSchedule_rc2 modifies mw_contentScheduleBase := {
choice := omit
}
template Schedule mw_contentSchedule_rc3 modifies mw_contentScheduleBase := {
choice := omit
}
template Schedule mw_contentSchedule_rc4 modifies mw_contentScheduleBase := {
choice := omit
}
template Schedule mw_contentSchedule_rc5 modifies mw_contentScheduleBase := {
choice := omit
}
template Schedule mw_contentSchedule_rc6 modifies mw_contentScheduleBase := {
choice := omit
}
template Schedule mw_contentSchedule_rc7 modifies mw_contentScheduleBase := {
choice := omit
}
template Subscription mw_contentSubscriptionBase := {
resourceName := ?,
resourceType := ?,
resourceID := ?,
parentID := ?,
creationTime := ?,
lastModifiedTime := ?,
labels := *,
accessControlPolicyIDs := *,
expirationTime := ?,
eventNotificationCriteria := *,
expirationCounter := *,
notificationURI := ?,
groupID := *,
notificationForwardingURI := *,
batchNotify := *,
rateLimit := *,
preSubscriptionNotify := *,
pendingNotification := *,
notificationStoragePriority := *,
latestNotify := *,
notificationContentType := ?,
notificationEventCat := *,
creator := *,
subscriberURI := *,
choice := *
};
template Subscription mw_contentSubscription_rc1 modifies mw_contentSubscriptionBase := {
choice := omit
}
template Subscription mw_contentSubscription_rc2 modifies mw_contentSubscriptionBase := {
choice := omit
}
template Subscription mw_contentSubscription_rc3 modifies mw_contentSubscriptionBase := {
choice := omit
}
template Subscription mw_contentSubscription_rc4 modifies mw_contentSubscriptionBase := {
choice := omit
}