Fix #64

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Functions.ttcn

@@ -235,6 +235,8 @@ module OneM2M_Functions {
       		var charstring v_binding_in;
       		var charstring v_host;
 			var PrimitiveContent v_cSEBaseResource;
+			
+			//Initialization of component variables
 			vc_config := e_cf02CseSimuMaster;
 			vc_testSystemRole := e_cse;	
 			vc_cseType := p_cseType;
@@ -248,6 +250,9 @@ module OneM2M_Functions {
 			map(self:mccPort, system:mccPort) param (PX_TS_CSE1.mccPort);
 			map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
 			map(self:acPort, system:acPort);
+			if(PX_UT_IMPLEMENTED) {
+				map(self:utPort, system:utPort) param (PX_TS_UT);
+			}
 			
 			if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
 				v_binding := "HTTP";
@@ -456,6 +461,7 @@ module OneM2M_Functions {
 				vc_ae2.start(f_cf01DownAe2());
 				vc_ae2.done;
 			}
+		
 		}// end f_cf01Down
 		
 		/**
@@ -466,6 +472,7 @@ module OneM2M_Functions {
 			unmap(self:mcaPort, system:mcaPort);
 			unmap(self:acPort, system:acPort);
 			unmap(self:mcaPortIn, system:mcaPortIn);
+		
 		}// end f_cf01DownAe2
 		
 		/**
@@ -481,6 +488,7 @@ module OneM2M_Functions {
 			unmap(vc_cse1:mccPort, system:mccPort);
 			unmap(vc_cse1:mccPortIn, system:mccPortIn);
 			unmap(vc_cse1:acPort, system:acPort);
+		
 		}// end f_cf02Down
 		
 		/**
@@ -491,8 +499,12 @@ module OneM2M_Functions {
 			unmap(self:mccPort, system:mccPort);
 			unmap(self:mccPortIn, system:mccPortIn);
 			unmap(self:acPort, system:acPort);
+			if(PX_UT_IMPLEMENTED){
+				unmap(self:utPort, system:utPort);
+			}
 			unmap(vc_ae1:mcaPort, system:mcaPort);
 			unmap(vc_ae1:acPort, system:acPort);
+		
 		}// end f_cf02DownCseSimuMaster
 		
 		/**
@@ -501,10 +513,11 @@ module OneM2M_Functions {
 		function f_cf03Down() runs on CseSimu {
 			
 			unmap(self:mcaPortIn, system:mcaPortIn);
+			unmap(self:acPort, system:acPort);
 			if(PX_UT_IMPLEMENTED){
 				unmap(self:utPort, system:utPort);
 			}
-			unmap(self:acPort, system:acPort);
+			
 		}// end f_cf03Down
 		
 		/**
@@ -518,6 +531,7 @@ module OneM2M_Functions {
 			if(PX_UT_IMPLEMENTED){
 				unmap(self:utPort, system:utPort);
 			}
+		
 		}// end f_cf04Down
 
 	}//end group configFunctions