Adapted to modified CfMessage and Ipv6NodeParams. (faa84a59) · Commits · MTS - Methods for Testing and Specification / IPv6 / IPv6

javasrc/com/testingtech/ttcn/tri/IPv6TestAdapter.java

+13 −21

Original line number	Diff line number	Diff line
		@@ -733,27 +733,14 @@ TriPlatformPA, TciEncoding, JpcapHandler, TestAdapterDefinitions, IEnumDefinitio

		String typeName = value.getType().getName();

		if (typeName.equals(CfgMessage) \|\| typeName.equals(Ipv4CfgMessage)){
		if (typeName.equals(CfgMessage)){
		String role = "";
		String netDeviceId = "";
		RecordOfValue macFilterList = null;
		RecordValue ipNodeParam = null;
		PTCAndRole par = null;

		String [] ipNodeParamList = null;
		String [][] ipNodeParams = null;
		IpVersion ipVersion = null;
		//Check if we run IPv4 or IPv6
		if (typeName.equals(CfgMessage)) {
		ipNodeParamList = IPv6NODEPARAMSLIST;
		ipNodeParams = IPv6NODEPARAMS;
		ipVersion = IpVersion.IPv6;
		}
		else {
		ipNodeParamList = IPv4NODEPARAMSLIST;
		ipNodeParams = IPv4NODEPARAMS;
		ipVersion = IpVersion.IPv4;
		}
		IpVersion ipVersion = IpVersion.IPv6;

		/* Prepare the rcvMap and the sendMap */
		if (!((RecordValue)value).getField(ROLE).notPresent()) {
		@@ -764,6 +751,11 @@ TriPlatformPA, TciEncoding, JpcapHandler, TestAdapterDefinitions, IEnumDefinitio
		return new TriStatusImpl(typeName + " does not contain mandatory " + ROLE + " field");
		}

		//Check if we run IPv4 or IPv6
		if (role.startsWith(IPV4ROUTER_ROLE)) {
		ipVersion = IpVersion.IPv6;
		}

		if (!((RecordValue)value).getField(NETDEVICEID).notPresent()) {
		netDeviceId = ((CharstringValue)((RecordValue)value).getField(NETDEVICEID)).getString();
		}
		@@ -771,16 +763,16 @@ TriPlatformPA, TciEncoding, JpcapHandler, TestAdapterDefinitions, IEnumDefinitio
		return new TriStatusImpl(value.getType().getName() + " does not contain mandatory " + NETDEVICEID + " field");
		}

		for (int i=0; i<ipNodeParamList.length; i++) {
		ipNodeParam = (RecordValue)((RecordValue)value).getField(ipNodeParamList[i]);
		for (int i=0; i<IPv6NODEPARAMSLIST.length; i++) {
		ipNodeParam = (RecordValue)((RecordValue)value).getField(IPv6NODEPARAMSLIST[i]);
		if (dbg)
		System.out.println(ipNodeParamList[i]);
		System.out.println(IPv6NODEPARAMSLIST[i]);
		if (!ipNodeParam.notPresent()) {
		if (dbg)
		System.out.println(ipNodeParamList[i] + "is present");
		System.out.println(IPv6NODEPARAMSLIST[i] + "is present");
		if (!(ipNodeParam).getField(HANDLECFG).notPresent()
		&& (((BooleanValue)(ipNodeParam).getField(HANDLECFG)).getBoolean()) == true) {
		rstatus = handleConfig(ipNodeParam, netDeviceId, par, ipNodeParamList[i].equals("paramsIut"), ipNodeParams);
		rstatus = handleConfig(ipNodeParam, netDeviceId, par, IPv6NODEPARAMSLIST[i].equals("paramsIut"), IPv6NODEPARAMS);
		if (rstatus.getStatus() == TriStatus.TRI_ERROR) {
		return rstatus;
		}

javasrc/com/testingtech/ttcn/tri/TestAdapterDefinitions.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ public interface TestAdapterDefinitions {
		public final String ROLE = "role";
		// public final String HOST_ROLE = "Host";
		public final String ROUTER_ROLE = "Router";
		public final String IPV4ROUTER_ROLE = "Ipv4Router";
		public final String NETDEVICEID = "netDeviceId";
		public final String MACFILTERLIST = "macFilterList";

		@@ -75,23 +76,13 @@ public interface TestAdapterDefinitions {
		{ "solNodeMca", "macSolNodeMca" },
		{ "haAca", "macUca" },
		{ "mnHoa", "macUca" },
		{ "mnCoa", "macUca" }//,
		// { "haGlas", "macUca" }
		{ "mnCoa", "macUca" },
		{ "ipv4Addr", "macUca" }
		};
		public final int FADDR = 0;
		public final int FADDRMAC = 1;
		public final String HANDLECFG = "useInTa";

		public final String Ipv4CfgMessage = "Ipv4CfMessage";
		public final String[] IPv4NODEPARAMSLIST = {
		"paramsRt01",
		"paramsIut"
		};

		public final String[][] IPv4NODEPARAMS = {
		{ "ipv4Addr", "macUca" }
		};

		/**
		* Well-known MAC addresses
		*/