Skip to content
Snippets Groups Projects
Commit 2a073d97 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'STF531-CSEBase' into 'master' 

Stf531 cse base



See merge request !18
parents f20c6657 9b97b9e6
No related branches found
No related tags found
1 merge request!25Ae fixes
Expand all Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Functions.ttcn
+ 5
− 5
View file @ 2a073d97
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 299 2017-06-20 12:36:36Z reinaortega $
* $Id: OneM2M_Functions.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -998,10 +998,10 @@ module OneM2M_Functions {
}
}
/**
* @desc Registration of Test System (simulating a CSE) to the CSE IUT (creation of remoteCSE)
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
/**
* @desc Registration of Test System (simulating a CSE) to the CSE IUT (creation of remoteCSE)
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
*/
function f_cse_registerRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on CseTester return integer {
......
LibOneM2M/OneM2M_Pics.ttcn
+ 1
− 0
View file @ 2a073d97
......@@ -18,6 +18,7 @@ module OneM2M_Pics {
* @see oneM2M TS-0017 A.5.5.1/1
*/
modulepar boolean PICS_ACP_SUPPORT := true;
modulepar boolean PICS_IN_CSE := true;
} // end of module
LibOneM2M/OneM2M_Pixits.ttcn
+ 4
− 1
View file @ 2a073d97
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 298 2017-06-14 07:11:13Z reinaortega $
* $Id: OneM2M_Pixits.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
......@@ -79,4 +79,7 @@ module OneM2M_Pixits {
modulepar Labels PX_LABELS := {"VALUE_1"};
modulepar boolean PX_IS_LOC_CONTAINER := false;//default //set it to true when the container is created to store location information
modulepar PoaList PX_POA := {""};
modulepar ResourceTypeList PX_SRT := {int1, int2, int3, int4};
} // end of module
LibOneM2M/OneM2M_Templates.ttcn
+ 88
− 5
View file @ 2a073d97
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 305 2017-06-20 13:56:26Z reinaortega $
* $Id: OneM2M_Templates.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -367,6 +367,14 @@ module OneM2M_Templates {
primitiveContent:= {group_optional := m_contentUpdateGroup}
};
/**
* @desc Base UPDATE request primitive for CSEBase resource
*/
template (value) RequestPrimitive m_updateCSEBaseBase modifies m_update := {
requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
primitiveContent:= {cSEBase_optional := m_contentUpdateCSEBase}
};
/**
* @desc Base UPDATE request primitive for Schedule resource
*/
......@@ -542,11 +550,20 @@ module OneM2M_Templates {
primitiveContent := {accessControlPolicy_optional := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
};
template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
/*template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
from_ := PX_SUPER_USER,
requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
primitiveContent := {cSEBase_optional := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}
};*/
/**
* @desc Base CREATE request primitive for CSEBase resource
*/
template (value) RequestPrimitive m_createCSEBaseBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000),
resourceType := int5,
primitiveContent := {cSEBase_optional := m_contentCreateCSEBase}
};
......@@ -1182,7 +1199,7 @@ module OneM2M_Templates {
accessControlObjectDetails_list := {}
}
template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
......@@ -1202,7 +1219,29 @@ module OneM2M_Templates {
serviceSubscribedAppRule := p_serviceSubscribedAppRule
}}
}
}
}*/
/**
* @desc Base primitiveContent for CREATE operation for CSEBase resource
* @param p_name Resource name
*/
template (value) CSEBase_optional m_contentCreateCSEBase (in template (omit) XSD.String p_name := c_defaultResourceName):= {
resourceName := p_name,//O
resourceType := omit,
resourceID := omit,
parentID := omit,
creationTime := omit,
lastModifiedTime := omit,
labels := omit,
accessControlPolicyIDs := omit,
cseType := omit,
cSE_ID := omit,
supportedResourceType := omit,
pointOfAccess := omit,
nodeLink := omit,
e2eSecInfo := omit,
choice := omit
};
/**
* @desc Base primitiveContent for CREATE operation for Group resource
......@@ -1776,7 +1815,7 @@ module OneM2M_Templates {
/**
* @desc Base primitiveContent for CREATE operation for StatConfig resource
* @param p_primitiveContent Content for the StatConfig
* @param p_primitiveConten t Content for the StatConfig
*/
template StatsConfig_optional m_contentCreateStatConfigBase := {
resourceName := c_defaultStatsConfigResourceName, //O
......@@ -1943,6 +1982,28 @@ module OneM2M_Templates {
choice := omit//NP
};
/**
* @desc Base primitiveContent for UPDATE operation for CSEBase resource
*/
template (value) CSEBase_optional m_contentUpdateCSEBase := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
parentID := omit,
creationTime := omit,
lastModifiedTime := omit,
labels := omit,
accessControlPolicyIDs := omit,
cseType := omit,
cSE_ID := omit,
supportedResourceType := omit,
pointOfAccess := omit,
nodeLink := omit,
e2eSecInfo := omit,
choice := omit
};
/**
* @desc Base primitiveContent for UPDATE operation for PollingChannel resource
......@@ -2918,6 +2979,28 @@ module OneM2M_Templates {
notificationEventType := ?
}
};
template CSEBase_optional mw_contentCSEBaseBase := {
resourceName := ?,//M
resourceType := ?,//M
resourceID := ?,//M
parentID := ?,//M
creationTime := ?,//M
lastModifiedTime := ?,//M
labels := *,//O
accessControlPolicyIDs := *,//O
cseType := *,//O
cSE_ID := ?,//M
supportedResourceType := ?,//M
pointOfAccess := ?,//M
nodeLink := *,//O
e2eSecInfo := *,//O
choice := *//O
};
template CSEBase_optional mw_contentCSEBase_rc1 modifies mw_contentCSEBaseBase := {
choice := omit //O
}
}//end group responseContent
......
LibOneM2M/OneM2M_TestSystem.ttcn
+ 1
− 1
View file @ 2a073d97
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 298 2017-06-14 07:11:13Z reinaortega $
* $Id: OneM2M_TestSystem.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Test System module for oneM2M
*
*/
......
LibOneM2M/OneM2M_Types.ttcn
+ 1
− 1
View file @ 2a073d97
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
* $Id: OneM2M_Types.ttcn 305 2017-06-20 13:56:26Z reinaortega $
* $Id: OneM2M_Types.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc OneM2M data types module
*
*/
......
LibOneM2M/OneM2M_TypesAndValues.ttcn
+ 1
− 1
View file @ 2a073d97
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
* $Id: OneM2M_TypesAndValues.ttcn 305 2017-06-20 13:56:26Z reinaortega $
* $Id: OneM2M_TypesAndValues.ttcn 306 2017-06-20 16:19:04Z reinaortega $
* @desc Module containing types and values for oneM2M
*
*/
......
OneM2M_Testcases.ttcn
+ 456
− 136
View file @ 2a073d97
This diff is collapsed.
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