From 50ceccfc81438aedd3d2e3d349885362c8d35ae9 Mon Sep 17 00:00:00 2001 From: berge Date: Mon, 28 Jun 2010 16:08:04 +0000 Subject: [PATCH] Renamed System component and added missing ports --- ttcn/LibITS_Interface.ttcn | 16 ++++++++-------- ttcn/LibITS_TestSystem.ttcn | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ttcn/LibITS_Interface.ttcn b/ttcn/LibITS_Interface.ttcn index 5967240b..269d2e11 100644 --- a/ttcn/LibITS_Interface.ttcn +++ b/ttcn/LibITS_Interface.ttcn @@ -52,8 +52,8 @@ module LibITS_Interface { port BTPPort btpPort; // NT2 ports - port GeoNetPort geoNetPort; - port GeoNetOverIPv6Port geoNetOverIPv6Port; + port GeoNetworkingPort geoNetPort; + port IPv6OverGeoNetworkingPort ipv6OverGeoNetworkingPort; // NT3 ports port FastPort fastPort; @@ -153,18 +153,18 @@ module LibITS_Interface { group NT2Ports { /** - * @desc NT2 GeoNetworking Port (GeoNet/G5) + * @desc NT2 GeoNetworking Port (GeoNetworking/G5) */ - type port GeoNetPort message { + type port GeoNetworkingPort message { - } // end GeoNetPort + } // end GeoNetworkingPort /** - * @desc NT2 GeoNetworking over IPv6 Port (GeoNet/IPv6/G5) + * @desc NT2 IPv6 over GeoNetworking Port (IPv6/GeoNetworking/G5) */ - type port GeoNetOverIPv6Port message { + type port IPv6OverGeoNetworkingPort message { - } // end GeoNetOverIPv6Port + } // end IPv6OverGeoNetworkingPort } // end NT2Ports diff --git a/ttcn/LibITS_TestSystem.ttcn b/ttcn/LibITS_TestSystem.ttcn index 77e29918..cb8119f2 100644 --- a/ttcn/LibITS_TestSystem.ttcn +++ b/ttcn/LibITS_TestSystem.ttcn @@ -7,6 +7,9 @@ */ module LibITS_TestSystem { + // LibITS + import from LibITS_Interface all; + group portDefinitions { /** @@ -38,13 +41,39 @@ module LibITS_TestSystem { } // end ItsMtc /** - * @desc ITS System Adaper + * @desc ITS System Adapter */ - type component ItsAdapter { + type component ItsSystem { port UpperTesterPort utPort; port AdapterControlPort acPort; + // AC1 ports + port MacM5Port macM5Port; + + // AC2 ports + port MacIRPort macIRPort; + + // FA1 ports + port CAMPort camPort; + port DENMPort denmPort; + + // FA2 ports + port CooperPort cooperPort; + + // MGT1 ports + port IISCPort iiscPort; + + // NT1 ports + port BTPPort btpPort; + + // NT2 ports + port GeoNetworkingPort geoNetPort; + port IPv6OverGeoNetworkingPort ipv6OverGeoNetworkingPort; + + // NT3 ports + port FastPort fastPort; + } // end ItsAdapter } // end componentDefinitions -- GitLab