fix errors in poi-server and test script

11 files changed, 421 insertions, 100 deletions

diff --git a/api/poi-service/genivi-poiservice-configuration.xml b/api/poi-service/genivi-poiservice-configuration.xml
index 62c671d..63c2301 100644
--- a/api/poi-service/genivi-poiservice-configuration.xml
+++ b/api/poi-service/genivi-poiservice-configuration.xml
@@ -7,7 +7,7 @@
      this file, you can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <node xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="/org/genivi/navigationcore" xsi:noNamespaceSchemaLocation="introspect.xsd">
-  <interface name="org.genivi.navigation.poiservice.Configuration">
+  <interface name="org.genivi.navigation.poiservice.POIConfiguration">
     <version>1.0.0 (10-03-2015)</version>
     <doc>
       <line>Configuration = This interface offers functions to set and retrieve configuration parameters</line>
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index a05b1d2..0cf27f5 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -23,6 +23,8 @@ option(WITH_DBUS_INTERFACE
        "Build using the D-Bus interfaces" ON)
 option(WITH_DEBUG
         "Enable the debug messages" OFF)
+option(WITH_DLT
+        "Enable DLT logging" OFF)
 option(WITH_SPEECH
         "Enable the voice messages" OFF)
 option(WITH_PLUGIN_MIGRATION
@@ -40,6 +42,7 @@ option(NAVIT_QTPAINTER
 
 message(STATUS "WITH_DBUS_INTERFACE = ${WITH_DBUS_INTERFACE}")
 message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+message(STATUS "WITH_DLT = ${WITH_DLT}")
 message(STATUS "WITH_SPEECH = ${WITH_SPEECH}")
 message(STATUS "WITH_PLUGIN_MIGRATION = ${WITH_PLUGIN_MIGRATION}")
 message(STATUS "YOCTO_CONFIG = ${YOCTO_CONFIG}")
diff --git a/src/navigation/clone_and_build.sh b/src/navigation/clone_and_build.sh
index a5f411e..02527c9 100755
--- a/src/navigation/clone_and_build.sh
+++ b/src/navigation/clone_and_build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 build_option=""
-positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80'
-navit_version='72a9284980f0ff6b8dd3972c0c15b3945c94559c'
+positioning_version='57345f36fa6095ecb6d7f7998a06abafbcd90a87'
+navit_version='5607f355e77250cebd5326a7c7959eb07c12adc2'
 
 echo "version of positioning is: $positioning_version"
 echo "version of navit is: $navit_version"
diff --git a/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt b/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
index b1f6a34..144cff6 100644
--- a/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
@@ -35,10 +35,17 @@ if(WITH_SPEECH)
     include_directories(${DBUS_GENERATED_INCLUDE_DIR}/speech-service)
 endif()
 
+if(WITH_DLT)
+    pkg_check_modules(DLT REQUIRED automotive-dlt)
+    add_definitions("-DDLT_ENABLED=1")
+    include_directories( ${DLT_INCLUDE_DIRS} )
+    set(LIBRARIES ${LIBRARIES} ${DLT_LIBRARIES})
+endif()
+
 include_directories(${DBUS_GENERATED_INCLUDE_DIR}/navigation-core)
 
 set(genivi_navigationcore_guidance_LIBS ${PLUGIN_LDFLAGS})
 set(genivi_navigationcore_guidance_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
 
 module_add_library(genivi_navigationcore_guidance genivi_navigationcore_guidance.cxx ${DBUS_GENERATED_INCLUDE_DIR}/navigation-core/genivi-navigationcore-guidance_adaptor.h)
-
+target_link_libraries(genivi_navigationcore_guidance ${LIBRARIES})
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 30c7f0f..2ac3e2b 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -57,6 +57,11 @@
 #define dbg(level,...) ;
 #endif
 
+#if (DLT_ENABLED)
+#include "dlt.h"
+DLT_DECLARE_CONTEXT(con_test)
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
@@ -132,7 +137,7 @@ class GuidanceObj
 };
 
 void GuidanceObj_Callback(GuidanceObj *obj);
-static class GuidanceObj *guidance;
+static class GuidanceObj *s_guidance;
 static struct attr vehicle_speed={attr_speed,(char *)40};
 
 static struct navit *
@@ -210,7 +215,8 @@ class  Guidance
 	Guidance(DBus::Connection &connection)
 	: DBus::ObjectAdaptor(connection, "/org/genivi/navigationcore")
 	{
-        simulationMode = true; //by default
+        m_simulationMode = true; //by default
+        m_guidance_active=false;
 	}
 
 	void
@@ -221,7 +227,7 @@ class  Guidance
 		vehicle.type=attr_vehicle;
         vehicle.u.vehicle=get_vehicle(Activate?"enhancedposition:":"demo:");
 		if (vehicle.u.vehicle) {
-            simulationMode = Activate;
+            m_simulationMode = Activate;
 			struct navit *navit=get_navit();
 			navit_set_attr(navit, &vehicle);
 		} else {
@@ -232,41 +238,57 @@ class  Guidance
 	bool
     GetSimulationMode()
     {
-        return (simulationMode);
+        return (m_simulationMode);
     }
 
 	void	
     StartGuidance(const uint32_t& SessionHandle, const uint32_t& RouteHandle)
 	{
         dbg(lvl_debug,"enter\n");
-		if (guidance) {
+        if (m_guidance_active) {
             dbg(lvl_debug,"guidance already active\n");
 			throw DBus::ErrorFailed("guidance already active");
-		}
-		guidance=new GuidanceObj(this, SessionHandle, RouteHandle);
+        } else {
+#if (DLT_ENABLED)
+            DLT_REGISTER_APP("GUID","Navigation core guidance");
+            DLT_REGISTER_CONTEXT(con_test,"TEST","Navigation context for testing");
+#endif
+            s_guidance=new GuidanceObj(this, SessionHandle, RouteHandle);
+            m_guidance_active=true;
+#if (DLT_ENABLED)
+            DLT_LOG(con_test,DLT_LOG_INFO,DLT_STRING("guidance active: "),DLT_BOOL(m_guidance_active));
+#endif
+        }
 	}
 
 	void	
     StopGuidance(const uint32_t& SessionHandle)
 	{
         dbg(lvl_debug,"enter\n");
-		if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
 			throw DBus::ErrorFailed("no guidance active");
-		}
-		delete(guidance);
-		guidance=NULL;
+        } else {
+            delete(s_guidance);
+            m_guidance_active=false;
+#if (DLT_ENABLED)
+            DLT_LOG(con_test,DLT_LOG_INFO,DLT_STRING("guidance active: "),DLT_BOOL(m_guidance_active));
+            DLT_UNREGISTER_CONTEXT(con_test);
+            DLT_UNREGISTER_APP();
+#endif
+        }
 	}
 
     void
     GetDestinationInformation(uint32_t& offset, uint32_t& travelTime, int32_t& direction, int32_t& side, int16_t& timeZone, int16_t& daylightSavingTime)
 	{
         dbg(lvl_debug,"enter\n");
-		if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
 			throw DBus::ErrorFailed("no guidance active");
-		}
-        guidance->GetDestinationInformation(offset, travelTime, direction, timeZone);
+        } else {
+            s_guidance->GetDestinationInformation(offset, travelTime, direction, timeZone);
+        }
 	}
 
 	::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string >
@@ -284,8 +306,8 @@ class  Guidance
     SetSimulationSpeed(const uint32_t& sessionHandle, const uint8_t& speedFactor)
 	{
 		vehicle_speed.u.num=speedFactor*40/4;
-		if (guidance)
-			guidance->SetSimulationSpeed(sessionHandle);
+        if (m_guidance_active==true)
+            s_guidance->SetSimulationSpeed(sessionHandle);
 	}
 
 	uint8_t
@@ -297,48 +319,57 @@ class  Guidance
 	void
     PauseGuidance(const uint32_t& sessionHandle)
 	{
-		if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
 			throw DBus::ErrorFailed("no guidance active");
-		}
-		guidance->PauseGuidance(sessionHandle);
+        } else {
+            s_guidance->PauseGuidance(sessionHandle);
+        }
 	}
 
 	void
     ResumeGuidance(const uint32_t& sessionHandle)
 	{
-		if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
 			throw DBus::ErrorFailed("no guidance active");
-		}
-		guidance->ResumeGuidance(sessionHandle);
+        } else {
+            s_guidance->ResumeGuidance(sessionHandle);
+        }
 	}
 
 	int32_t
 	SetVoiceGuidance(const bool& activate, const std::string& voice)
 	{
-        guidance->SetVoiceGuidance(activate,voice);
+        if (m_guidance_active==false) {
+            dbg(lvl_debug,"no guidance active\n");
+            throw DBus::ErrorFailed("no guidance active");
+        } else {
+            s_guidance->SetVoiceGuidance(activate,voice);
+        }
         return(0); //not implemented yet
 	}
 
 	void
     GetGuidanceDetails(bool& voiceGuidance, bool& vehicleOnTheRoad, bool& isDestinationReached, int32_t& maneuver)
 	{
-		if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
 			throw DBus::ErrorFailed("no guidance active");
-		}
-		guidance->GetGuidanceDetails(voiceGuidance, vehicleOnTheRoad, isDestinationReached, maneuver);
+        } else {
+            s_guidance->GetGuidanceDetails(voiceGuidance, vehicleOnTheRoad, isDestinationReached, maneuver);
+        }
 	}
 
     int32_t
 	PlayVoiceManeuver()
 	{
-        if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
             throw DBus::ErrorFailed("no guidance active");
+        } else {
+            s_guidance->PlayVoiceManeuver();
         }
-        guidance->PlayVoiceManeuver();
         return(0); //not implemented yet
 	}
 
@@ -351,11 +382,12 @@ class  Guidance
     void
     GetManeuversList(const uint16_t& requestedNumberOfManeuvers, const uint32_t& maneuverOffset, int32_t& error, uint16_t& numberOfManeuvers, std::vector< ::DBus::Struct< std::vector< ::DBus::Struct< std::string, std::vector< ::DBus::Struct< int32_t, std::string > >, std::string > >, std::string, std::string, std::string, std::string, uint16_t, int32_t, uint32_t, std::vector< ::DBus::Struct< uint32_t, uint32_t, int32_t, int32_t, std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > > > > > >& maneuversList)
 	{
-		if (!guidance) {
+        if (m_guidance_active==false) {
             dbg(lvl_debug,"no guidance active\n");
 			throw DBus::ErrorFailed("no guidance active");
-		}
-		guidance->GetManeuversList(requestedNumberOfManeuvers, maneuverOffset, numberOfManeuvers, maneuversList);
+        } else {
+            s_guidance->GetManeuversList(requestedNumberOfManeuvers, maneuverOffset, numberOfManeuvers, maneuversList);
+        }
         error=0; //not used
     }
 
@@ -375,8 +407,8 @@ class  Guidance
 	void
     GetGuidanceStatus(int32_t& guidanceStatus, uint32_t& routeHandle)
 	{
-		if (guidance) {
-			guidance->GetGuidanceStatus(guidanceStatus, routeHandle);
+        if (m_guidance_active==true) {
+            s_guidance->GetGuidanceStatus(guidanceStatus, routeHandle);
 		} else {
 			guidanceStatus=GENIVI_NAVIGATIONCORE_INACTIVE;
 			routeHandle=0;
@@ -386,14 +418,24 @@ class  Guidance
     int32_t
     SetVoiceGuidanceSettings(const int32_t& promptMode)
 	{
-        guidance->SetVoiceGuidanceSettings(promptMode);
+        if (m_guidance_active==false) {
+            dbg(lvl_debug,"no guidance active\n");
+            throw DBus::ErrorFailed("no guidance active");
+        } else {
+            s_guidance->SetVoiceGuidanceSettings(promptMode);
+        }
         return(0); //not implemented yet
 	}
 
     int32_t
 	GetVoiceGuidanceSettings()
 	{
-        return guidance->GetVoiceGuidanceSettings();
+        if (m_guidance_active==false) {
+            dbg(lvl_debug,"no guidance active\n");
+            throw DBus::ErrorFailed("no guidance active");
+        } else {
+            return s_guidance->GetVoiceGuidanceSettings();
+        }
 	}
 
     void
@@ -408,7 +450,8 @@ class  Guidance
         throw DBus::ErrorNotSupported("Not yet supported");
     }
 
-    bool simulationMode;
+    bool m_simulationMode;
+    bool m_guidance_active;
 };
 
 void
@@ -694,7 +737,6 @@ GuidanceObj::GetGuidanceStatus(int32_t &guidanceStatus, uint32_t& routeHandle)
 	routeHandle=m_route_handle;
 }
 
-
 void
 GuidanceObj_Callback(GuidanceObj *obj)
 {
@@ -730,7 +772,13 @@ GuidanceObj_Callback(GuidanceObj *obj)
 			maneuver=GENIVI_NAVIGATIONCORE_INVALID;
 		}
 		obj->m_guidance->ManeuverChanged(maneuver);
-	} else {
+#if (DLT_ENABLED)
+        DLT_LOG(con_test,DLT_LOG_INFO,DLT_STRING("maneuver: "),DLT_INT16(maneuver));
+#endif
+    } else {
+#if (DLT_ENABLED)
+        DLT_LOG(con_test,DLT_LOG_ERROR,DLT_STRING("item not found"));
+#endif
         dbg(lvl_debug,"failed to get level item=%p\n",item);
 	}
 }
@@ -744,7 +792,6 @@ variant_double(double d)
 	return variant;
 }
 
-
 void
 GuidanceObj_TrackingCallback(GuidanceObj *obj)
 {
@@ -776,8 +823,12 @@ struct map_rect *
 GuidanceObj::get_map_rect(void)
 {
 	struct map *map=navigation_get_map(get_navigation());
-	if (!map)
-		return NULL;
+    if (!map) {
+#if (DLT_ENABLED)
+        DLT_LOG(con_test,DLT_LOG_ERROR,DLT_STRING("map_rect null"));
+#endif
+        return NULL;
+    }
 	return map_rect_new(map, NULL);
 }
 
@@ -824,6 +875,9 @@ GuidanceObj::GuidanceObj(Guidance *guidance, uint32_t SessionHandle, uint32_t Ro
 		g_free(ret);
 	}
 	m_guidance->GuidanceStatusChanged(GENIVI_NAVIGATIONCORE_ACTIVE, RouteHandle);
+#if (DLT_ENABLED)
+            DLT_LOG(con_test,DLT_LOG_INFO,DLT_STRING("guidance status: "),DLT_INT16(GENIVI_NAVIGATIONCORE_ACTIVE));
+#endif
 }
 
 GuidanceObj::~GuidanceObj()
@@ -842,10 +896,13 @@ GuidanceObj::~GuidanceObj()
 #if (SPEECH_ENABLED)
     delete(m_speechoutput);
 #endif
+#if (DLT_ENABLED)
+            DLT_LOG(con_test,DLT_LOG_INFO,DLT_STRING("guidance status: "),DLT_INT16(GENIVI_NAVIGATIONCORE_INACTIVE));
+#endif
 
 }
 
-static class Guidance *server;
+static class Guidance *s_server;
 
 void
 plugin_init(void)
@@ -856,5 +913,5 @@ plugin_init(void)
 	conn = new DBus::Connection(DBus::Connection::SessionBus());
 	conn->setup(&dispatcher);
 	conn->request_name("org.genivi.navigation.navigationcore.Guidance");
-	server=new Guidance(*conn);
+    s_server=new Guidance(*conn);
 }
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index a2b06a4..50bb074 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -43,14 +43,14 @@
 #include "poi-server-class.h"
 
 
-static const char* poiSearch_SERVICE_NAME = "org.genivi.poiservice.POISearch";
+static const char* poiSearch_SERVICE_NAME = "org.genivi.navigation.poiservice.POISearch";
 static const char* poiSearch_OBJECT_PATH = "/org/genivi/poiservice/POISearch";
-static const char* poiConfiguration_SERVICE_NAME = "org.genivi.poiservice.Configuration";
-static const char* poiConfiguration_OBJECT_PATH = "/org/genivi/poiservice/Configuration";
-static const char* poiContentAccess_SERVICE_NAME = "org.genivi.poiservice.POIContentAccess";
+static const char* poiConfiguration_SERVICE_NAME = "org.genivi.navigation.poiservice.POIConfiguration";
+static const char* poiConfiguration_OBJECT_PATH = "/org/genivi/poiservice/POIConfiguration";
+static const char* poiContentAccess_SERVICE_NAME = "org.genivi.navigation.poiservice.POIContentAccess";
 static const char* poiContentAccess_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccess";
 static const char* contentAccessModule_OBJECT_PATH = "/org/genivi/poiservice/POIContentAccessModule";
-static const char* Routing_SERVICE_NAME = "org.genivi.navigationcore.Routing";
+static const char* Routing_SERVICE_NAME = "org.genivi.navigation.navigationcore.Routing";
 static const char* Routing_OBJECT_PATH = "/org/genivi/navigationcore";
 
 // SQL requests
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index f8b8cc4..3f90a00 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -62,7 +62,7 @@ class poiSearchServer;
 class poiContentAccessServer;
 
 class Routing
-: public org::genivi::navigationcore::Routing_proxy,
+: public org::genivi::navigation::navigationcore::Routing_proxy,
   public DBus::IntrospectableProxy,
   public DBus::ObjectProxy
 {
@@ -87,7 +87,7 @@ class Routing
 };
 
 class  contentAccessModule
-: public org::genivi::poiservice::POIContentAccessModule_proxy,
+: public org::genivi::navigation::poiservice::POIContentAccessModule_proxy,
   public DBus::IntrospectableProxy,
   public DBus::ObjectProxy
 {
@@ -109,7 +109,7 @@ private:
 };
 
 class  poiContentAccessServer
-: public org::genivi::poiservice::POIContentAccess_adaptor,
+: public org::genivi::navigation::poiservice::POIContentAccess_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -208,7 +208,7 @@ private:
 };
 
 class  poiSearchServer
-: public org::genivi::poiservice::POISearch_adaptor,
+: public org::genivi::navigation::poiservice::POISearch_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
@@ -351,7 +351,7 @@ private:
 };
 
 class  poiConfigurationServer
-: public org::genivi::poiservice::Configuration_adaptor,
+: public org::genivi::navigation::poiservice::POIConfiguration_adaptor,
   public DBus::IntrospectableAdaptor,
   public DBus::ObjectAdaptor
 {
diff --git a/test/navigation/dlt-triggers/navigation.dlf b/test/navigation/dlt-triggers/navigation.dlf
index 7aeeaea..14876d7 100644
--- a/test/navigation/dlt-triggers/navigation.dlf
+++ b/test/navigation/dlt-triggers/navigation.dlf
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dltfilter>
     <filter>
-        <type>1</type>
-        <name>HIDE-APP</name>
+        <type>0</type>
+        <name>New Filter</name>
         <ecuid></ecuid>
-        <applicationid>APP</applicationid>
-        <contextid></contextid>
+        <applicationid>NAVI</applicationid>
+        <contextid>TEST</contextid>
         <headertext></headertext>
         <payloadtext></payloadtext>
         <enableregexp_Context>0</enableregexp_Context>
@@ -16,7 +16,7 @@
         <enablefilter>1</enablefilter>
         <enableecuid>0</enableecuid>
         <enableapplicationid>1</enableapplicationid>
-        <enablecontextid>0</enablecontextid>
+        <enablecontextid>1</enablecontextid>
         <enableheadertext>0</enableheadertext>
         <enablepayloadtext>0</enablepayloadtext>
         <enablectrlmsgs>0</enablectrlmsgs>
@@ -28,10 +28,91 @@
         <logLevelMin>0</logLevelMin>
     </filter>
     <filter>
-        <type>1</type>
-        <name>HIDE-DA1</name>
+        <type>0</type>
+        <name>New Filter</name>
+        <ecuid></ecuid>
+        <applicationid>GUID</applicationid>
+        <contextid>TEST</contextid>
+        <headertext></headertext>
+        <payloadtext></payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>1</enableapplicationid>
+        <enablecontextid>1</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>0</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ffffff</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>2</type>
+        <name>New Filter</name>
+        <ecuid></ecuid>
+        <applicationid></applicationid>
+        <contextid></contextid>
+        <headertext></headertext>
+        <payloadtext>Start</payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>0</enableapplicationid>
+        <enablecontextid>0</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>1</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#00ff00</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>2</type>
+        <name>New Filter</name>
+        <ecuid></ecuid>
+        <applicationid></applicationid>
+        <contextid></contextid>
+        <headertext></headertext>
+        <payloadtext>Stop</payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>0</enableapplicationid>
+        <enablecontextid>0</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>1</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ff0000</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>0</type>
+        <name>New Filter</name>
         <ecuid></ecuid>
-        <applicationid>DA1</applicationid>
+        <applicationid>GNSS</applicationid>
         <contextid></contextid>
         <headertext></headertext>
         <payloadtext></payloadtext>
@@ -55,13 +136,13 @@
         <logLevelMin>0</logLevelMin>
     </filter>
     <filter>
-        <type>2</type>
+        <type>0</type>
         <name>New Filter</name>
         <ecuid>ECU1</ecuid>
-        <applicationid>NAVI</applicationid>
-        <contextid>TEST</contextid>
+        <applicationid>DLTD</applicationid>
+        <contextid>INTM</contextid>
         <headertext></headertext>
-        <payloadtext>Start test</payloadtext>
+        <payloadtext>registered for PID </payloadtext>
         <enableregexp_Context>0</enableregexp_Context>
         <enableregexp_Header>0</enableregexp_Header>
         <enableregexp_Payload>0</enableregexp_Payload>
@@ -77,18 +158,18 @@
         <enableLogLevelMin>0</enableLogLevelMin>
         <enableLogLevelMax>0</enableLogLevelMax>
         <enableMarker>0</enableMarker>
-        <filterColour>#00ff00</filterColour>
+        <filterColour>#ffffff</filterColour>
         <logLevelMax>0</logLevelMax>
         <logLevelMin>0</logLevelMin>
     </filter>
     <filter>
-        <type>2</type>
+        <type>0</type>
         <name>New Filter</name>
         <ecuid>ECU1</ecuid>
-        <applicationid>NAVI</applicationid>
-        <contextid>TEST</contextid>
+        <applicationid>DLTD</applicationid>
+        <contextid>INTM</contextid>
         <headertext></headertext>
-        <payloadtext>Stop test</payloadtext>
+        <payloadtext>Unregistered ApID</payloadtext>
         <enableregexp_Context>0</enableregexp_Context>
         <enableregexp_Header>0</enableregexp_Header>
         <enableregexp_Payload>0</enableregexp_Payload>
@@ -104,7 +185,62 @@
         <enableLogLevelMin>0</enableLogLevelMin>
         <enableLogLevelMax>0</enableLogLevelMax>
         <enableMarker>0</enableMarker>
-        <filterColour>#ff0000</filterColour>
+        <filterColour>#ffffff</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>1</type>
+        <name>New Filter</name>
+        <ecuid>ECU1</ecuid>
+        <applicationid>DLTD</applicationid>
+        <contextid>INTM</contextid>
+        <headertext>2017/02/10 15:11:59.673396 142200.1224 74 ECU1 DLTD INTM 67615 log info verbose 1</headertext>
+        <payloadtext>Unregistered ApID 'NAVI'
+</payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>0</enableapplicationid>
+        <enablecontextid>0</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>1</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ffffff</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>1</type>
+        <name>New Filter</name>
+        <ecuid>ECU1</ecuid>
+        <applicationid>DLTD</applicationid>
+        <contextid>INTM</contextid>
+        <headertext>2017/02/10 15:11:59.673194 142200.1223 71 ECU1 DLTD INTM 67615 log info verbose 1</headertext>
+        <payloadtext>ApplicationID 'NAVI' registered for PID</payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>0</enableapplicationid>
+        <enablecontextid>0</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>1</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ffffff</filterColour>
         <logLevelMax>0</logLevelMax>
         <logLevelMin>0</logLevelMin>
     </filter>
diff --git a/test/navigation/dlt-triggers/test-scripts.dlf b/test/navigation/dlt-triggers/test-scripts.dlf
new file mode 100644
index 0000000..7aeeaea
--- /dev/null
+++ b/test/navigation/dlt-triggers/test-scripts.dlf
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dltfilter>
+    <filter>
+        <type>1</type>
+        <name>HIDE-APP</name>
+        <ecuid></ecuid>
+        <applicationid>APP</applicationid>
+        <contextid></contextid>
+        <headertext></headertext>
+        <payloadtext></payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>1</enableapplicationid>
+        <enablecontextid>0</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>0</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ffffff</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>1</type>
+        <name>HIDE-DA1</name>
+        <ecuid></ecuid>
+        <applicationid>DA1</applicationid>
+        <contextid></contextid>
+        <headertext></headertext>
+        <payloadtext></payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>0</enableecuid>
+        <enableapplicationid>1</enableapplicationid>
+        <enablecontextid>0</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>0</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ffffff</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>2</type>
+        <name>New Filter</name>
+        <ecuid>ECU1</ecuid>
+        <applicationid>NAVI</applicationid>
+        <contextid>TEST</contextid>
+        <headertext></headertext>
+        <payloadtext>Start test</payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>1</enableecuid>
+        <enableapplicationid>1</enableapplicationid>
+        <enablecontextid>1</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>1</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#00ff00</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+    <filter>
+        <type>2</type>
+        <name>New Filter</name>
+        <ecuid>ECU1</ecuid>
+        <applicationid>NAVI</applicationid>
+        <contextid>TEST</contextid>
+        <headertext></headertext>
+        <payloadtext>Stop test</payloadtext>
+        <enableregexp_Context>0</enableregexp_Context>
+        <enableregexp_Header>0</enableregexp_Header>
+        <enableregexp_Payload>0</enableregexp_Payload>
+        <ignoreCase_Header>0</ignoreCase_Header>
+        <ignoreCase_Payload>0</ignoreCase_Payload>
+        <enablefilter>1</enablefilter>
+        <enableecuid>1</enableecuid>
+        <enableapplicationid>1</enableapplicationid>
+        <enablecontextid>1</enablecontextid>
+        <enableheadertext>0</enableheadertext>
+        <enablepayloadtext>1</enablepayloadtext>
+        <enablectrlmsgs>0</enablectrlmsgs>
+        <enableLogLevelMin>0</enableLogLevelMin>
+        <enableLogLevelMax>0</enableLogLevelMax>
+        <enableMarker>0</enableMarker>
+        <filterColour>#ff0000</filterColour>
+        <logLevelMax>0</logLevelMax>
+        <logLevelMin>0</logLevelMin>
+    </filter>
+</dltfilter>
diff --git a/test/navigation/test-guidance.py b/test/navigation/test-guidance.py
index be53895..616f36c 100755
--- a/test/navigation/test-guidance.py
+++ b/test/navigation/test-guidance.py
@@ -131,6 +131,9 @@ def guidance_guidanceStatusChanged_handler(guidanceStatus,routeHandle):
    
 def guidance_positionOnRouteChanged_handler(offsetOnRoute):
     print "Offset on route: " +str(offsetOnRoute)
+    
+def guidance_maneuverChanged_handler(maneuver):
+    print "Maneuver: " +str(maneuver)
     ret = g_guidance_interface.GetDestinationInformation()
     print "Travel time: " +str(ret[1])
     ret = g_guidance_interface.GetManeuversList(dbus.UInt16(10),dbus.UInt32(0))
@@ -138,7 +141,7 @@ def guidance_positionOnRouteChanged_handler(offsetOnRoute):
     print "Next road to turn: " +str(ret[2][0][4])
     g_mapmatchedposition_interface.SetSimulationMode(dbus.UInt32(g_navigationcore_session_handle),dbus.Boolean(False))
     g_guidance_interface.StopGuidance(dbus.UInt32(g_navigationcore_session_handle))
-    
+
 def mapmatchedposition_simulationStatusChanged_handler(simulationStatus):
     print "Simulation status: " +str(simulationStatus)
         
@@ -298,6 +301,10 @@ bus.add_signal_receiver(guidance_positionOnRouteChanged_handler, \
                         dbus_interface = "org.genivi.navigation.navigationcore.Guidance", \
                         signal_name = "PositionOnRouteChanged")
 
+bus.add_signal_receiver(guidance_maneuverChanged_handler, \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Guidance", \
+                        signal_name = "ManeuverChanged")
+
 bus.add_signal_receiver(mapmatchedposition_simulationStatusChanged_handler, \
                         dbus_interface = "org.genivi.navigation.navigationcore.MapMatchedPosition", \
                         signal_name = "SimulationStatusChanged")
diff --git a/test/navigation/test-poi.py b/test/navigation/test-poi.py
index 7df6c82..a4b48c7 100755
--- a/test/navigation/test-poi.py
+++ b/test/navigation/test-poi.py
@@ -39,8 +39,8 @@ test_name = "poi search"
 
 #constants as defined in the Navigation API
 GENIVI_Configuration_Settings_LOCALE = 37
-GENIVI_SearchStatusState_FINISHED = 1298
-GENIVI_SearchStatusState_NOT_STARTED = 1296
+GENIVI_SearchStatusState_FINISHED = 512
+GENIVI_SearchStatusState_NOT_STARTED = 510
 
 #constants used into the script
 TIME_OUT = 10000
@@ -58,7 +58,7 @@ STRING_TO_SEARCH = "Saint-Germain"
 def catch_poi_configurationChanged_signal_handler(changedSettings):
     for changedSetting in changedSettings:
         if changedSetting == GENIVI_Configuration_Settings_LOCALE:
-            ret=g_poiConfiguration_interface.getLocale()
+            ret=g_poiConfiguration_interface.GetLocale()
             print("language: " + ret[0]) 
             print("country: " + ret[1]) 
             print("script: " + ret[2])
@@ -68,25 +68,25 @@ def catch_poi_poiStatus_signal_handler(poiSearchHandle,statusValue):
         if statusValue == GENIVI_SearchStatusState_FINISHED:
             print("Search finished")
         elif statusValue == GENIVI_SearchStatusState_NOT_STARTED:
-            g_poiSearch_interface.deletePoiSearchHandle(poiSearchHandle)
+            g_poiSearch_interface.DeletePoiSearchHandle(poiSearchHandle)
             print("Test PASSED")
             exit()
          
 def catch_poi_resultListChanged_signal_handler(poiSearchHandle,resultListSize):
     poiList=[]
     if poiSearchHandle == g_searchHandle and resultListSize != 0:
-        ret=g_poiSearch_interface.requestResultList(dbus.UInt32(poiSearchHandle),dbus.UInt16(0),dbus.UInt16(resultListSize),[ATTRIBUTE_SOURCE,ATTRIBUTE_PHONE])
+        ret=g_poiSearch_interface.RequestResultList(dbus.UInt32(poiSearchHandle),dbus.UInt16(0),dbus.UInt16(resultListSize),[ATTRIBUTE_SOURCE,ATTRIBUTE_PHONE])
         if ret[0] == GENIVI_SearchStatusState_FINISHED and ret[1] >= 0:
             print("Results: "+str(int(ret[1])))
             for result in ret[2]:
                 poiList.append(result[0])
-            ret=g_poiSearch_interface.getPoiDetails(poiList)
+            ret=g_poiSearch_interface.GetPoiDetails(poiList)
             for resultDetail in ret:
                 if resultDetail[1][0] == ID_HOTEL:
                     print("Hotel: " +resultDetail[0][1])
                 elif resultDetail[1][0] == ID_STATION:
                     print("Station: " +resultDetail[0][1])
-            g_poiSearch_interface.cancelPoiSearch(dbus.UInt32(poiSearchHandle))           
+            g_poiSearch_interface.CancelPoiSearch(dbus.UInt32(poiSearchHandle))           
        
 #timeout
 def timeout():
@@ -108,31 +108,31 @@ bus = dbus.SessionBus()
 
 bus.add_signal_receiver(catch_poi_configurationChanged_signal_handler, \
                         dbus_interface = "org.genivi.navigation.poiservice.POIConfiguration", \
-                        signal_name = "configurationChanged")
+                        signal_name = "ConfigurationChanged")
 
 bus.add_signal_receiver(catch_poi_poiStatus_signal_handler, \
                         dbus_interface = "org.genivi.navigation.poiservice.POISearch", \
-                        signal_name = "poiStatus")
+                        signal_name = "PoiStatus")
 
 bus.add_signal_receiver(catch_poi_resultListChanged_signal_handler, \
                         dbus_interface = "org.genivi.navigation.poiservice.POISearch", \
-                        signal_name = "resultListChanged")
+                        signal_name = "ResultListChanged")
 
 startTrigger(test_name)
 
-poiConfiguration = bus.get_object('org.genivi.navigation.poiservice.POIConfiguration','/org/genivi/poiservice')
-g_poiConfiguration_interface = dbus.Interface(poiConfiguration, dbus_interface='org.genivi.navigation.navigation.poiservice.POIConfiguration')
+poiConfiguration = bus.get_object('org.genivi.navigation.poiservice.POIConfiguration','/org/genivi/poiservice/POIConfiguration')
+g_poiConfiguration_interface = dbus.Interface(poiConfiguration, dbus_interface='org.genivi.navigation.poiservice.POIConfiguration')
 
-poiContentAccess = bus.get_object('org.genivi.navigation.poiservice.POIContentAccess','/org/genivi/poiservice')
-g_poiContentAccess_interface = dbus.Interface(poiContentAccess, dbus_interface='org.genivi.navigation.navigation.poiservice.POIContentAccess')
+poiContentAccess = bus.get_object('org.genivi.navigation.poiservice.POIContentAccess','/org/genivi/poiservice/POIContentAccess')
+g_poiContentAccess_interface = dbus.Interface(poiContentAccess, dbus_interface='org.genivi.navigation.poiservice.POIContentAccess')
 
-poiSearch = bus.get_object('org.genivi.navigation.poiservice.POISearch','/org/genivi/poiservice')
+poiSearch = bus.get_object('org.genivi.navigation.poiservice.POISearch','/org/genivi/poiservice/POISearch')
 g_poiSearch_interface = dbus.Interface(poiSearch, dbus_interface='org.genivi.navigation.poiservice.POISearch')
 
-g_poiConfiguration_interface.setLocale(dbus.String("fra"),dbus.String("FRA"),dbus.String("Latn"))
+g_poiConfiguration_interface.SetLocale(dbus.String("fra"),dbus.String("FRA"),dbus.String("Latn"))
 
 categories=[]
-ret=g_poiSearch_interface.getAvailableCategories()
+ret=g_poiSearch_interface.GetAvailableCategories()
 for categoryAndName in ret:
     if categoryAndName[0] == ID_HOTEL or categoryAndName[0] == ID_STATION:
         print("Category ID: " + str(int(categoryAndName[0])))
@@ -142,7 +142,7 @@ for categoryAndName in ret:
 attributes_hotel=[]
 attributes_station=[]
 attributesDetails=[]
-ret=g_poiSearch_interface.getCategoriesDetails(categories)
+ret=g_poiSearch_interface.GetCategoriesDetails(categories)
 for results in ret:
     if results[0][0] == ID_HOTEL:
         for attribute in results[1]:
@@ -153,22 +153,22 @@ for results in ret:
             attributes_station.append(attribute[0])
             attributesDetails.append(dbus.Struct([dbus.UInt32(attribute[0]),dbus.UInt32(ID_STATION),dbus.Int32(1280),dbus.Struct([dbus.Byte(2),dbus.String("")]),dbus.Int32(1314),dbus.Boolean(False)])) 
         
-ret=g_poiSearch_interface.getRootCategory()
+ret=g_poiSearch_interface.GetRootCategory()
 
-g_searchHandle=g_poiSearch_interface.createPoiSearchHandle()
+g_searchHandle=g_poiSearch_interface.CreatePoiSearchHandle()
 print("Search handle: " + str(int(g_searchHandle)))
 
 lat = LATITUDE_PARIS
 lon = LONGITUDE_PARIS
 alt = ALTITUDE_PARIS
 
-g_poiSearch_interface.setCenter(g_searchHandle,dbus.Struct([lat,lon,alt]))
+g_poiSearch_interface.SetCenter(g_searchHandle,dbus.Struct([lat,lon,alt]))
 
-g_poiSearch_interface.setCategories(g_searchHandle,[dbus.Struct([dbus.UInt32(ID_HOTEL),dbus.UInt32(RADIUS_HOTEL)]),dbus.Struct([dbus.UInt32(ID_STATION),dbus.UInt32(RADIUS_STATION)])])
+g_poiSearch_interface.SetCategories(g_searchHandle,[dbus.Struct([dbus.UInt32(ID_HOTEL),dbus.UInt32(RADIUS_HOTEL)]),dbus.Struct([dbus.UInt32(ID_STATION),dbus.UInt32(RADIUS_STATION)])])
 
-g_poiSearch_interface.setAttributes(g_searchHandle,attributesDetails)
+g_poiSearch_interface.SetAttributes(g_searchHandle,attributesDetails)
 
-g_poiSearch_interface.startPoiSearch(g_searchHandle,dbus.String(STRING_TO_SEARCH),dbus.Int32(1376))
+g_poiSearch_interface.StartPoiSearch(g_searchHandle,dbus.String(STRING_TO_SEARCH),dbus.Int32(1376))
 
 
 #main loop