Reg

OneM2M_Functions.ttcn

@@ -33,7 +33,6 @@ module OneM2M_Functions {
     			
 			// Map
 			map(self:mcaPort, system:mcaPort);
-			map(self:mccPort, system:mccPort);
 			map(self:acPort, system:acPort);
 			activate(a_default());
     			
@@ -42,6 +41,22 @@ module OneM2M_Functions {
 			//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
 	
@@ -113,37 +128,9 @@ module OneM2M_Functions {
 		
 			var M2MResponsePrimitive v_response;
 			var integer v_cseBaseAuxIndex := -1;
-			var integer v_acpAuxIndex := -1;
-			var ServiceSubscribedAppRule_optional v_serviceSubscribedAppRule;
+			var RequestPrimitive v_request;
 
-			v_serviceSubscribedAppRule.applicableCredIDs := {"None"};
-			v_serviceSubscribedAppRule.allowedApp_IDs := {PX_APP_ID};
-			v_serviceSubscribedAppRule.allowedAEs := valueof(p_allowedAEs);
-			
-			mcaPort.send(m_request(m_createServiceSubscribedAppRule(v_serviceSubscribedAppRule)));
-		
-			tc_ac.start;
-			alt {
-				[] mcaPort.receive(mw_response(int2001)) -> value v_response{
-					tc_ac.stop;
-					v_cseBaseAuxIndex := f_setResource(v_response.responsePrimitive_.primitiveContent);
-					vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_cseBaseAuxIndex};
-				}
-				[] mcaPort.receive(mw_responseKO) {
-					tc_ac.stop;
-					setverdict(inconc, "Preamble: Error while registering application");
-					stop;
-				}
-				[] mcaPort.receive {
-					tc_ac.stop;
-					setverdict(inconc, "Preamble: Unexpected message received");
-					stop;
-				}
-				[] tc_ac.timeout {
-					setverdict(inconc, "Preamble: No answer while registering resource");
-					stop;
-				}
-			}	
+			v_cseBaseAuxIndex := f_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
 			
 			return v_cseBaseAuxIndex;
 		
@@ -198,6 +185,13 @@ module OneM2M_Functions {
 			
 		function f_postamble_default() runs on M2M {
 	
+			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);