Reg

OneM2M_Functions.ttcn

@@ -24,23 +24,39 @@ module OneM2M_Functions {
group configFunctions {
-    	/**
-    		@desc 
-    	*/
-    	function f_cf01Up() runs on M2M {
-    		// Variables
-    		// Map
-    		map(self:mcaPort, system:mcaPort);
-    		map(self:acPort, system:acPort);
-    		activate(a_default());
-    		// Connect
-    		//Initialze the IUT
-    	} // end f_cf01Up
+		/**
+			@desc 
+		*/
+		function f_cf01Up() runs on M2M {
+			// Variables
+			// Map
+			map(self:mcaPort, system:mcaPort);
+			map(self:acPort, system:acPort);
+			activate(a_default());
+			// Connect
+    						
+			//Initialze the IUT
+		} // end f_cf01Up
+		
+		function f_cf02Up() runs on M2M {
+    			
+			// Variables
+    			
+			// Map
+			map(self:mcaPort, system:mcaPort);
+			map(self:mccPort, system:mccPort);
+			map(self:acPort, system:acPort);
+			activate(a_default());
+    			
+			// Connect
+			//Initialze the IUT
+    						
+		} // end f_cf02Up
}//end group configFunctions
@@ -64,7 +80,7 @@ module OneM2M_Functions {
//TODO Test, to be removed
v_request.to_ := f_addPrefix(f_getResourceAddress());
-    			mcaPort.send(m_request(v_request));
+				mcaPort.send(m_request(v_request));
//mcaPort.send(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & c_acpAuxName})));
} else {
mcaPort.send(m_request(m_createAeAux()));
@@ -106,6 +122,19 @@ module OneM2M_Functions {
return v_aeAuxIndex;
}
+		
+		//Added by @Naum
+		function f_preamble_prepareCSE(in template ListOfM2MID p_allowedAEs, in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{//c_CRUDNDi
+		
+			var M2MResponsePrimitive v_response;
+			var integer v_serviceSubscribedAppRuleIndex := -1;
+			var RequestPrimitive v_request;
+
+			v_serviceSubscribedAppRuleIndex := f_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
+			
+			return v_serviceSubscribedAppRuleIndex;
+		
+		}
}//end group preambleFunctions
@@ -156,7 +185,15 @@ module OneM2M_Functions {
function f_postamble_default() runs on M2M {
-			unmap(self:mcaPort, system:mcaPort); 
+			unmap(self:mcaPort, system:mcaPort);
+			unmap(self:acPort, system:acPort);
+			//stop;
+		}	
+		
+		function f_postamble_CF02() runs on M2M {
+	
+			unmap(self:mcaPort, system:mcaPort);
+			unmap(self:mccPort, system:mccPort);
unmap(self:acPort, system:acPort);
//stop;
}
@@ -187,11 +224,11 @@ module OneM2M_Functions {
function f_getCreateRequestPrimitive(in ResourceType p_resourceType, in template (omit) AccessControlOperations p_allowedOperations, template RequestPrimitive p_request, integer p_parentIndex) runs on M2M return RequestPrimitive {
-            p_request.from_ := f_getOriginator(p_parentIndex);
-            p_request.to_ := f_addPrefix(f_getResourceAddress(p_parentIndex));
-            //p_request.name := p_name;
+			p_request.from_ := f_getOriginator(p_parentIndex);
+			p_request.to_ := f_addPrefix(f_getResourceAddress(p_parentIndex));
+			//p_request.name := p_name;
if (p_resourceType == int1) {//AccessControlPolicy
@@ -507,12 +544,12 @@ module OneM2M_Functions {
v_request.to_ := f_addPrefix(p_acpAddress);
v_request.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := {
-    			{
-    				accessControlOriginators := PX_ACOR, //{"admin:admin"}
-    				accessControlOperations := valueof(p_allowedOperations),
-    				accessControlContexts_list := omit
-    			}
-    		};
+				{
+					accessControlOriginators := PX_ACOR, //{"admin:admin"}
+					accessControlOperations := valueof(p_allowedOperations),
+					accessControlContexts_list := omit
+				}
+			};
mcaPort.send(m_request(v_request));
tc_ac.start;