Stf531 cse base

LibOneM2M/OneM2M_Templates.ttcn

@@ -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
*
*/
@@ -368,6 +368,14 @@ module OneM2M_Templates {
};
/**
+			 * @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
*/
template (value) RequestPrimitive m_updateScheduleBase modifies m_update := {
@@ -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