Commit 05956ce3 authored by juvancic's avatar juvancic
Browse files

updated ta module

parent 32cfa198

javasrc/com/iskratel/ttcn/tri/VxlteAdapter.java

+17 −9
Original line number Original line Diff line number Diff line
@@ -7,6 +7,8 @@ 
package com.iskratel.ttcn.tri;

package com.iskratel.ttcn.tri;









import java.nio.file.Files;

import java.nio.file.Paths;

import java.util.Enumeration;

import java.util.Enumeration;

import java.util.HashMap;

import java.util.HashMap;

import java.util.Hashtable;

import java.util.Hashtable;
@@ -316,7 +318,10 @@ public class VxlteAdapter extends TestAdapter implements TriCommunicationSA, Tri 
	}

	}





	public TciCDProvided getCodec(String s) {

	public TciCDProvided getCodec(String s) {

		loginfo(">>> TciCDProvided.getCodec for " + portNameForCoding + " = " + ((s != null) ? s : "(null)"));

		TciCDProvided codec = null;

		

		//loginfo(">>> TciCDProvided.getCodec for " + portNameForCoding + " = " + ((s != null) ? s : "(null)"));

		loginfo(">>> TciCDProvided.getCodec " + ((s != null) ? s : "(null)"));

		if (s == null  || s.equals("")) {

		if (s == null  || s.equals("")) {

			

			

			loginfo("No codec name for usage!!! Last used port = " + portNameForCoding);			

			loginfo("No codec name for usage!!! Last used port = " + portNameForCoding);
@@ -333,13 +338,14 @@ public class VxlteAdapter extends TestAdapter implements TriCommunicationSA, Tri 
			}else if (portNameForCoding.startsWith("diameterPort")){

			}else if (portNameForCoding.startsWith("diameterPort")){

				s= "DIAMETERCodec";

				s= "DIAMETERCodec";

			}

			}

			codec = super.getCodec(s);

		} else {

			codec = super.getCodec(s);

		}

		}

		

		

		TciCDProvided codec = super.getCodec(s);

//		if (codec != null) {		

		

//			return codec;

		if (codec != null) {		

//		}

			return codec;

		}





		return codec;		

		return codec;		

	}

	}
@@ -349,8 +355,10 @@ public class VxlteAdapter extends TestAdapter implements TriCommunicationSA, Tri 
		//loginfo("Executing TestCase"+ testcase.getTestCaseName());

		//loginfo("Executing TestCase"+ testcase.getTestCaseName());

	    

	    

		this.testcaseName=testcase.getTestCaseName();

		this.testcaseName=testcase.getTestCaseName();

	    

		if(Files.exists(Paths.get(ROOTFOLDERTRACEFILE+this.testcaseName+".pcapng")))

	    	return super.triExecuteTestcase(testcase, tsiList);

	    	return super.triExecuteTestcase(testcase, tsiList);

		else

			return new TriStatusImpl("Check if correct capture file exists!("+this.testcaseName+".pcapng)");

	}

	}

	

	

	public TciParameterList getTestCaseParameters(TciModuleId moduleId,	String testCaseId) {

	public TciParameterList getTestCaseParameters(TciModuleId moduleId,	String testCaseId) {