vsomeip 3.1.16.13.1.16.1

30 files changed, 94 insertions, 1353 deletions

diff --git a/Android.bp b/Android.bp
index 9963703..276d4aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8,6 +8,7 @@ libvsomeip_srcs = [
    "implementation/utility/**/*.cpp",
    "implementation/plugin/**/*.cpp",
    "implementation/security/**/*.cpp",
+   "implementation/logger/**/*.cpp",
 ]
 
 libvsomeip_cfg_srcs = [
@@ -33,6 +34,7 @@ cc_defaults {
         "-Wno-unused-private-field",
         "-Wno-unused-lambda-capture",
         "-Wno-unused-variable",
+        "-Wno-unused-local-typedef",
         "-Wno-sign-compare",
         "-Wno-format",
         "-Wno-header-guard",
@@ -42,7 +44,7 @@ cc_defaults {
 }
 
 cc_library_shared {
-    name: "libvsomeip",
+    name: "libvsomeip3",
     vendor: true,
 
     srcs: libvsomeip_srcs,
@@ -76,7 +78,7 @@ cc_library_shared {
 }
 
 cc_library_shared {
-    name: "libvsomeip_cfg",
+    name: "libvsomeip3-cfg",
     vendor: true,
 
     srcs: libvsomeip_cfg_srcs,
@@ -93,14 +95,14 @@ cc_library_shared {
     ],
 
     shared_libs: [
-        "libvsomeip",
+        "libvsomeip3",
         "libboost_system",
         "libboost_filesystem"
     ]
 }
 
 cc_library_shared {
-    name: "libvsomeip_e2e",
+    name: "libvsomeip3-e2e",
     vendor: true,
 
     srcs: libvsomeip_e2e_srcs,
@@ -117,12 +119,12 @@ cc_library_shared {
     ],
 
     shared_libs: [
-       "libvsomeip"
+       "libvsomeip3"
     ]
 }
 
 cc_library_shared {
-    name: "libvsomeip_sd",
+    name: "libvsomeip3-sd",
     vendor: true,
 
     srcs: libvsomeip_sd_srcs,
@@ -139,6 +141,7 @@ cc_library_shared {
     ],
 
     shared_libs: [
-        "libvsomeip"
+        "libvsomeip3",
+        "libboost_thread"
     ]
 }
diff --git a/CHANGES b/CHANGES
index 436544f..39e715a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 Changes
 =======
 
+v3.1.16.1
+- Restore IPv6 within UDP server endpoint
+- AOSP build adaptation to vsomeip3 libraries
+
+v3.1.16
+- Fixed race condition when leaving multicast group
+- Do not busy loop when receiving garbage data on local endpoint
+
 v3.1.15
 - Ensure to remove the correct subscription object on unsubscribe
 - Implemented support to define "secure services"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c36f1f6..e2ccc46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,9 @@ set (VSOMEIP_COMPAT_NAME vsomeip)
 
 set (VSOMEIP_MAJOR_VERSION 3)
 set (VSOMEIP_MINOR_VERSION 1)
-set (VSOMEIP_PATCH_VERSION 15)
+set (VSOMEIP_PATCH_VERSION 16)
 set (VSOMEIP_HOTFIX_VERSION 1)
 
-
 set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP_PATCH_VERSION})
 set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentation/doxygen.in
 set (CMAKE_VERBOSE_MAKEFILE off)
diff --git a/examples/hello_world/Android.bp b/examples/hello_world/Android.bp
index 7622f0c..c7819c4 100644
--- a/examples/hello_world/Android.bp
+++ b/examples/hello_world/Android.bp
@@ -8,10 +8,11 @@ cc_defaults {
     ],
 
     shared_libs: [
-        "libvsomeip",
-        "libvsomeip_cfg",
-        "libvsomeip_e2e",
-        "libvsomeip_sd",
+        "libvsomeip3",
+        "libvsomeip3-cfg",
+        "libvsomeip3-e2e",
+        "libvsomeip3-sd",
+        "liblog",
     ],
 }
 
@@ -20,7 +21,7 @@ cc_binary {
     defaults: ["vsomeip_hello_world_defaults"],
 
     srcs: [
-        "hello_world_service.cpp",
+        "hello_world_service_main.cpp",
     ],
 }
 
@@ -29,12 +30,13 @@ cc_binary {
     defaults: ["vsomeip_hello_world_defaults"],
 
     srcs: [
-        "hello_world_client.cpp",
+        "hello_world_client_main.cpp",
     ],
 }
 
 prebuilt_etc {
     name: "helloworld-local.json",
+    vendor: true,
     sub_dir: "vsomeip",
     src: "helloworld-local.json",
 }
diff --git a/examples/hello_world/hello_world_client.hpp b/examples/hello_world/hello_world_client.hpp
index 06bea36..5c53810 100644
--- a/examples/hello_world/hello_world_client.hpp
+++ b/examples/hello_world/hello_world_client.hpp
@@ -4,15 +4,15 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #include <vsomeip/vsomeip.hpp>
 
-#ifdef __ANDROID__ // NDK
+#if defined ANDROID || defined __ANDROID__
 #include "android/log.h"
 #define LOG_TAG "hello_world_client"
-#define LOG_INF(...) (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__)
-#define LOG_ERR(...) (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__)
+#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__)
+#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__)
 #else
 #include <cstdio>
-#define LOG_INF(...) fprintf(stdout, __VA_ARGS__)
-#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__)
+#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n")
+#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n")
 #endif
 
 static vsomeip::service_t service_id = 0x1111;
diff --git a/examples/hello_world/hello_world_service.hpp b/examples/hello_world/hello_world_service.hpp
index 489d8fe..b88b73c 100644
--- a/examples/hello_world/hello_world_service.hpp
+++ b/examples/hello_world/hello_world_service.hpp
@@ -8,15 +8,15 @@
 #include <condition_variable>
 #include <mutex>
 
-#ifdef __ANDROID__ // NDK
+#if defined ANDROID || defined __ANDROID__
 #include "android/log.h"
 #define LOG_TAG "hello_world_service"
-#define LOG_INF(...) (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__)
-#define LOG_ERR(...) (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__)
+#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__)
+#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__)
 #else
 #include <cstdio>
-#define LOG_INF(...) fprintf(stdout, __VA_ARGS__)
-#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__)
+#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n")
+#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n")
 #endif
 
 static vsomeip::service_t service_id = 0x1111;
diff --git a/examples/hello_world/readme_android b/examples/hello_world/readme_android
index 3d56fdd..26ae73e 100644
--- a/examples/hello_world/readme_android
+++ b/examples/hello_world/readme_android
@@ -1,15 +1,15 @@
 AOSP:
 1. Apply vsomeip project to AOSP tree and build hello_world example (e.g. via mma build command)
 2. Push changes to target
-3. Start service and client via different adb shell sessions:
+3. Start service and client via different adb shell sessions under root user:
 
 Shell1:
-VSOMEIP_CONFIGURATION=/etc/vsomeip/helloworld-local.json \
+VSOMEIP_CONFIGURATION=/vendor/etc/vsomeip/helloworld-local.json \
 VSOMEIP_APPLICATION_NAME=hello_world_service \
 vsomeip_hello_world_service
 
 Shell2:
-VSOMEIP_CONFIGURATION=/etc/vsomeip/helloworld-local.json \
+VSOMEIP_CONFIGURATION=/vendor/etc/vsomeip/helloworld-local.json \
 VSOMEIP_APPLICATION_NAME=hello_world_client \
 vsomeip_hello_world_client
 
diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp
index 1c2c505..8043676 100644
--- a/implementation/configuration/include/internal_android.hpp
+++ b/implementation/configuration/include/internal_android.hpp
@@ -67,8 +67,6 @@
 #define VSOMEIP_MAX_DISPATCHERS                 10
 #define VSOMEIP_MAX_DISPATCH_TIME               100
 
-#define VSOMEIP_MAX_DESERIALIZER                5
-
 #define VSOMEIP_REQUEST_DEBOUNCE_TIME           10
 
 #define VSOMEIP_MAX_WAIT_SENT                   5
diff --git a/implementation/endpoints/src/endpoint_manager_impl.cpp b/implementation/endpoints/src/endpoint_manager_impl.cpp
index d4fedd4..dc02aa5 100644
--- a/implementation/endpoints/src/endpoint_manager_impl.cpp
+++ b/implementation/endpoints/src/endpoint_manager_impl.cpp
@@ -412,35 +412,42 @@ void endpoint_manager_impl::find_or_create_multicast_endpoint(
 }
 
 void endpoint_manager_impl::clear_multicast_endpoints(service_t _service, instance_t _instance) {
-    std::lock_guard<std::recursive_mutex> its_lock(endpoint_mutex_);
-    // Clear multicast info and endpoint and multicast instance (remote service)
-    if (multicast_info.find(_service) != multicast_info.end()) {
-        if (multicast_info[_service].find(_instance) != multicast_info[_service].end()) {
-            std::string address = multicast_info[_service][_instance]->get_address().to_string();
-            uint16_t port = multicast_info[_service][_instance]->get_port();
-            std::shared_ptr<endpoint> multicast_endpoint;
-            auto found_port = server_endpoints_.find(port);
-            if (found_port != server_endpoints_.end()) {
-                auto found_unreliable = found_port->second.find(false);
-                if (found_unreliable != found_port->second.end()) {
-                    multicast_endpoint = found_unreliable->second;
-                    dynamic_cast<udp_server_endpoint_impl*>(
-                            multicast_endpoint.get())->leave(address);
-                    multicast_endpoint->stop();
-                    server_endpoints_[port].erase(false);
+
+    std::shared_ptr<endpoint> multicast_endpoint;
+    std::string address;
+
+    {
+        std::lock_guard<std::recursive_mutex> its_lock(endpoint_mutex_);
+        // Clear multicast info and endpoint and multicast instance (remote service)
+        if (multicast_info.find(_service) != multicast_info.end()) {
+            if (multicast_info[_service].find(_instance) != multicast_info[_service].end()) {
+                address = multicast_info[_service][_instance]->get_address().to_string();
+                uint16_t port = multicast_info[_service][_instance]->get_port();
+                auto found_port = server_endpoints_.find(port);
+                if (found_port != server_endpoints_.end()) {
+                    auto found_unreliable = found_port->second.find(false);
+                    if (found_unreliable != found_port->second.end()) {
+                        multicast_endpoint = found_unreliable->second;
+                        server_endpoints_[port].erase(false);
+                    }
+                    if (found_port->second.find(true) == found_port->second.end()) {
+                        server_endpoints_.erase(port);
+                    }
                 }
-                if (found_port->second.find(true) == found_port->second.end()) {
-                    server_endpoints_.erase(port);
+                multicast_info[_service].erase(_instance);
+                if (0 >= multicast_info[_service].size()) {
+                    multicast_info.erase(_service);
                 }
+                // Clear service_instances_ for multicast endpoint
+                (void)remove_instance(_service, multicast_endpoint.get());
             }
-            multicast_info[_service].erase(_instance);
-            if (0 >= multicast_info[_service].size()) {
-                multicast_info.erase(_service);
-            }
-            // Clear service_instances_ for multicast endpoint
-            remove_instance(_service, multicast_endpoint.get());
         }
     }
+    if (multicast_endpoint) {
+        dynamic_cast<udp_server_endpoint_impl*>(
+                multicast_endpoint.get())->leave(address);
+        multicast_endpoint->stop();
+    }
 }
 
 bool endpoint_manager_impl::supports_selective(service_t _service,
diff --git a/implementation/endpoints/src/local_server_endpoint_impl.cpp b/implementation/endpoints/src/local_server_endpoint_impl.cpp
index ecfbd88..1d412e4 100644
--- a/implementation/endpoints/src/local_server_endpoint_impl.cpp
+++ b/implementation/endpoints/src/local_server_endpoint_impl.cpp
@@ -554,6 +554,7 @@ void local_server_endpoint_impl::connection::receive_cbk(
         return;
     }
 
+    bool is_error(false);
     std::size_t its_start = 0;
     std::size_t its_end = 0;
     std::size_t its_iteration_gap = 0;
@@ -757,13 +758,17 @@ void local_server_endpoint_impl::connection::receive_cbk(
                             missing_capacity_ <= recv_buffer_.capacity() - recv_buffer_size_) {
                         missing_capacity_ = 0;
                     }
+                } else if (message_is_empty) {
+                    VSOMEIP_ERROR << "Received garbage data.";
+                    is_error = true;
                 }
             }
         } while (recv_buffer_size_ > 0 && found_message);
     }
 
     if (_error == boost::asio::error::eof
-            || _error == boost::asio::error::connection_reset) {
+            || _error == boost::asio::error::connection_reset
+            || is_error) {
         stop();
         its_server->remove_connection(bound_client_);
         security::get()->remove_client_to_uid_gid_mapping(bound_client_);
diff --git a/implementation/endpoints/src/udp_server_endpoint_impl.cpp b/implementation/endpoints/src/udp_server_endpoint_impl.cpp
index 9d22d51..ce1bb2d 100644
--- a/implementation/endpoints/src/udp_server_endpoint_impl.cpp
+++ b/implementation/endpoints/src/udp_server_endpoint_impl.cpp
@@ -303,12 +303,26 @@ void udp_server_endpoint_impl::join(const std::string &_address) {
 
             boost::system::error_code ec;
 
+            bool is_v4(false);
+            bool is_v6(false);
+            {
+                std::lock_guard<std::mutex> its_lock(local_mutex_);
+                is_v4 = local_.address().is_v4();
+                is_v6 = local_.address().is_v6();
+            }
+
             if (multicast_recv_buffer_.empty())
                 multicast_recv_buffer_.resize(VSOMEIP_MAX_UDP_MESSAGE_SIZE, 0);
 
             if (!multicast_local_) {
-                multicast_local_ = std::unique_ptr<endpoint_type>(
-                    new endpoint_type(boost::asio::ip::address_v4::any(), local_port_));
+                if (is_v4) {
+                    multicast_local_ = std::unique_ptr<endpoint_type>(
+                        new endpoint_type(boost::asio::ip::address_v4::any(), local_port_));
+                }
+                if (is_v6) {
+                    multicast_local_ = std::unique_ptr<endpoint_type>(
+                        new endpoint_type(boost::asio::ip::address_v6::any(), local_port_));
+                }
             }
 
             if (!multicast_socket_) {
@@ -360,14 +374,6 @@ void udp_server_endpoint_impl::join(const std::string &_address) {
                 receive_multicast(multicast_id_);
             }
 
-            bool is_v4(false);
-            bool is_v6(false);
-            {
-                std::lock_guard<std::mutex> its_lock(local_mutex_);
-                is_v4 = local_.address().is_v4();
-                is_v6 = local_.address().is_v6();
-            }
-
             if (is_v4) {
                 multicast_socket_->set_option(ip::udp_ext::socket::reuse_address(true));
                 multicast_socket_->set_option(
diff --git a/interface/vsomeip/plugin.hpp b/interface/vsomeip/plugin.hpp
index dfb6bba..c7b73d9 100644
--- a/interface/vsomeip/plugin.hpp
+++ b/interface/vsomeip/plugin.hpp
@@ -7,6 +7,7 @@
 #define VSOMEIP_V3_PLUGIN_HPP_
 
 #include <memory>
+#include <string>
 
 #if _WIN32
     #if VSOMEIP_DLL_COMPILATION_PLUGIN
diff --git a/test/big_payload_tests/big_payload_test_udp_client.json b/test/big_payload_tests/big_payload_test_udp_client.json
deleted file mode 100644
index 7015f8a..0000000
--- a/test/big_payload_tests/big_payload_test_udp_client.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "netmask":"255.255.255.0",
-    "logging":
-    {
-        "level":"info",
-        "console":"true",
-        "file":
-        {
-            "enable":"true",
-            "path":"/var/log/vsomeip.log"
-        },
-        "dlt":"true"
-    },
-    "applications":
-    [
-        {
-            "name":"big_payload_test_client",
-            "id":"0x1343",
-            "max_dispatchers" : "0"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1240",
-            "instance":"0x01",
-            "unicast":"XXX.XXX.XXX.XXX",
-            "unreliable": "30509",
-            "someip-tp" : {
-                "client-to-service" : [ "0x8421" ]
-            }
-        }
-    ],
-    "max-payload-size-reliable":"614400",
-    "routing":"big_payload_test_client",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.244.224.245",
-        "port":"30490",
-        "protocol":"udp"
-    }
-}
diff --git a/test/big_payload_tests/big_payload_test_udp_service.json b/test/big_payload_tests/big_payload_test_udp_service.json
deleted file mode 100644
index bc90c40..0000000
--- a/test/big_payload_tests/big_payload_test_udp_service.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"debug",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"big_payload_test_service",
-            "id":"0x1277",
-            "max_dispatchers" : "0"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1240",
-            "instance":"0x01",
-            "unreliable": "30509",
-            "someip-tp" : {
-                "service-to-client" : [ "0x8421" ]
-            }
-        }
-    ],
-    "routing":"big_payload_test_service",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.244.224.245",
-        "port":"30490",
-        "protocol":"udp"
-    }
-}
diff --git a/test/initial_event_tests/initial_event_test_diff_client_ids_diff_ports_master_udp.json b/test/initial_event_tests/initial_event_test_diff_client_ids_diff_ports_master_udp.json
deleted file mode 100644
index eedfde4..0000000
--- a/test/initial_event_tests/initial_event_test_diff_client_ids_diff_ports_master_udp.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"initial_event_test_service_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"initial_event_test_service_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"initial_event_test_service_three",
-            "id":"0x3333"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1111",
-            "instance":"0x0001",
-            "unreliable":"30001"
-        },
-        {
-            "service":"0x2222",
-            "instance":"0x0001",
-            "unreliable":"30002"
-        },
-        {
-            "service":"0x3333",
-            "instance":"0x0001",
-            "unreliable":"30003"
-        },
-        {
-            "service":"0x8888",
-            "instance":"0x0001",
-            "unreliable":"8888"
-        }
-    ],
-    "routing":"initial_event_test_service_one",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/initial_event_tests/initial_event_test_diff_client_ids_diff_ports_slave_udp.json b/test/initial_event_tests/initial_event_test_diff_client_ids_diff_ports_slave_udp.json
deleted file mode 100644
index 4c47091..0000000
--- a/test/initial_event_tests/initial_event_test_diff_client_ids_diff_ports_slave_udp.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "diagnosis" : "0x63",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"initial_event_test_service_four",
-            "id":"0x4444"
-        },
-        {
-            "name":"initial_event_test_service_five",
-            "id":"0x5555"
-        },
-        {
-            "name":"initial_event_test_service_six",
-            "id":"0x6666"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x4444",
-            "instance":"0x0001",
-            "unreliable":"30004"
-        },
-        {
-            "service":"0x5555",
-            "instance":"0x0001",
-            "unreliable":"30005"
-        },
-        {
-            "service":"0x6666",
-            "instance":"0x0001",
-            "unreliable":"30006"
-        },
-        {
-            "service":"0x9999",
-            "instance":"0x0001",
-            "unreliable":"9999"
-        }
-    ],
-    "routing":"initial_event_test_service_four",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/initial_event_tests/initial_event_test_diff_client_ids_same_ports_master_udp.json b/test/initial_event_tests/initial_event_test_diff_client_ids_same_ports_master_udp.json
deleted file mode 100644
index d0e4e8f..0000000
--- a/test/initial_event_tests/initial_event_test_diff_client_ids_same_ports_master_udp.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"initial_event_test_service_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"initial_event_test_service_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"initial_event_test_service_three",
-            "id":"0x3333"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1111",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x2222",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x3333",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x8888",
-            "instance":"0x0001",
-            "unreliable":"8888"
-        }
-    ],
-    "routing":"initial_event_test_service_one",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/initial_event_tests/initial_event_test_diff_client_ids_same_ports_slave_udp.json b/test/initial_event_tests/initial_event_test_diff_client_ids_same_ports_slave_udp.json
deleted file mode 100644
index 22a12c7..0000000
--- a/test/initial_event_tests/initial_event_test_diff_client_ids_same_ports_slave_udp.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "diagnosis" : "0x63",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"initial_event_test_service_four",
-            "id":"0x4444"
-        },
-        {
-            "name":"initial_event_test_service_five",
-            "id":"0x5555"
-        },
-        {
-            "name":"initial_event_test_service_six",
-            "id":"0x6666"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x4444",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x5555",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x6666",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x9999",
-            "instance":"0x0001",
-            "unreliable":"9999"
-        }
-    ],
-    "routing":"initial_event_test_service_four",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/npdu_tests/npdu_test_client_no_npdu.json b/test/npdu_tests/npdu_test_client_no_npdu.json
deleted file mode 100644
index 1e20bee..0000000
--- a/test/npdu_tests/npdu_test_client_no_npdu.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"info",
-        "console":"true"
-    },
-    "applications":
-    [
-        {
-            "name":"npdu_test_routing_manager_daemon_client_side",
-            "id":"0x6666"
-        },
-        {
-            "name":"npdu_test_client_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"npdu_test_client_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"npdu_test_client_three",
-            "id":"0x3333"
-        },
-        {
-            "name":"npdu_test_client_four",
-            "id":"0x4444"
-        }
-    ],
-    "routing":"npdu_test_routing_manager_daemon_client_side",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp"
-    }
-}
diff --git a/test/npdu_tests/npdu_test_client_npdu.json b/test/npdu_tests/npdu_test_client_npdu.json
deleted file mode 100644
index 5bf34a0..0000000
--- a/test/npdu_tests/npdu_test_client_npdu.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"info",
-        "console":"true"
-    },
-    "applications":
-    [
-        {
-            "name":"npdu_test_routing_manager_daemon_client_side",
-            "id":"0x6666"
-        },
-        {
-            "name":"npdu_test_client_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"npdu_test_client_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"npdu_test_client_three",
-            "id":"0x3333"
-        },
-        {
-            "name":"npdu_test_client_four",
-            "id":"0x4444"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1000",
-            "instance":"0x0001",
-            "unicast":"XXX.XXX.XXX.XXX",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times":
-            {
-                "requests" : {
-                    "0x1001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x1002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x1003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x1004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        },
-        {
-            "service":"0x2000",
-            "instance":"0x0002",
-            "unicast":"XXX.XXX.XXX.XXX",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times" : {
-                "requests" : {
-                    "0x2001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x2002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x2003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x2004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        },
-        {
-            "service":"0x3000",
-            "instance":"0x0003",
-            "unicast":"XXX.XXX.XXX.XXX",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times" : {
-                "requests" : {
-                    "0x3001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x3002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x3003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x3004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        },
-        {
-            "service":"0x4000",
-            "instance":"0x0004",
-            "unicast":"XXX.XXX.XXX.XXX",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times": {
-                "requests" : {
-                    "0x4001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x4002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x4003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x4004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        }
-    ],
-    "routing":"npdu_test_routing_manager_daemon_client_side",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp"
-    }
-}
diff --git a/test/npdu_tests/npdu_test_service_no_npdu.json b/test/npdu_tests/npdu_test_service_no_npdu.json
deleted file mode 100644
index 2a857be..0000000
--- a/test/npdu_tests/npdu_test_service_no_npdu.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"info",
-        "console":"true"
-    },
-    "applications":
-    [
-        {
-            "name":"npdu_test_routing_manager_daemon_service_side",
-            "id":"0x6667"
-        },
-        {
-            "name":"npdu_test_service_one",
-            "id":"0x1000"
-        },
-        {
-            "name":"npdu_test_service_two",
-            "id":"0x2000"
-        },
-        {
-            "name":"npdu_test_service_three",
-            "id":"0x3000"
-        },
-        {
-            "name":"npdu_test_service_four",
-            "id":"0x4000"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x6667",
-            "instance":"0x6666",
-            "unreliable":"60666"
-        },
-        {
-            "service":"0x1000",
-            "instance":"0x0001",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            }
-        },
-        {
-            "service":"0x2000",
-            "instance":"0x0002",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            }
-        },
-        {
-            "service":"0x3000",
-            "instance":"0x0003",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            }
-        },
-        {
-            "service":"0x4000",
-            "instance":"0x0004",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            }
-        }
-    ],
-    "routing":"npdu_test_routing_manager_daemon_service_side",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp"
-    }
-}
diff --git a/test/npdu_tests/npdu_test_service_npdu.json b/test/npdu_tests/npdu_test_service_npdu.json
deleted file mode 100644
index 931c3e0..0000000
--- a/test/npdu_tests/npdu_test_service_npdu.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"info",
-        "console":"true"
-    },
-    "applications":
-    [
-        {
-            "name":"npdu_test_routing_manager_daemon_service_side",
-            "id":"0x6667"
-        },
-        {
-            "name":"npdu_test_service_one",
-            "id":"0x1000"
-        },
-        {
-            "name":"npdu_test_service_two",
-            "id":"0x2000"
-        },
-        {
-            "name":"npdu_test_service_three",
-            "id":"0x3000"
-        },
-        {
-            "name":"npdu_test_service_four",
-            "id":"0x4000"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x6667",
-            "instance":"0x6666",
-            "unreliable":"60666"
-        },
-        {
-            "service":"0x1000",
-            "instance":"0x0001",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times":
-            {
-                "responses" : {
-                    "0x1001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x1002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x1003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x1004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        },
-        {
-            "service":"0x2000",
-            "instance":"0x0002",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times" : {
-                "responses" : {
-                    "0x2001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x2002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x2003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x2004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        },
-        {
-            "service":"0x3000",
-            "instance":"0x0003",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times" : {
-                "responses" : {
-                    "0x3001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x3002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x3003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x3004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        },
-        {
-            "service":"0x4000",
-            "instance":"0x0004",
-            "unreliable":"30509",
-            "reliable":
-            {
-                "port":"30510",
-                "enable-magic-cookies":"false"
-            },
-            "debounce-times": {
-                "responses" : {
-                    "0x4001" : {
-                        "debounce-time" : "10",
-                        "maximum-retention-time" : "100"
-                    },
-                    "0x4002" : {
-                        "debounce-time" : "20",
-                        "maximum-retention-time" : "200"
-                    },
-                    "0x4003" : {
-                        "debounce-time" : "30",
-                        "maximum-retention-time" : "300"
-                    },
-                    "0x4004" : {
-                        "debounce-time" : "40",
-                        "maximum-retention-time" : "400"
-                    }
-                }
-            }
-        }
-    ],
-    "routing":"npdu_test_routing_manager_daemon_service_side",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp"
-    }
-}
diff --git a/test/someip_tp_tests/someip_tp_test_master.json b/test/someip_tp_tests/someip_tp_test_master.json
deleted file mode 100644
index 9c03887..0000000
--- a/test/someip_tp_tests/someip_tp_test_master.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"info",
-        "console":"true"
-    },
-    "applications" :
-    [
-        {
-            "name" : "someip_tp_test_service",
-            "id" : "0xCAFE"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x4545",
-            "instance":"0x1",
-            "unreliable":"30001",
-            "someip-tp" : {
-                "service-to-client": [ "0x4545", "0x8001"]
-            }
-        },
-        {
-            "service":"0x6767",
-            "instance":"0x1",
-            "unicast" : "XXX.XXX.XXX.XXX",
-            "unreliable":"40001",
-            "someip-tp" : {
-                "client-to-service": [ "0x6767", "0x8001" ]
-            }
-        }
-    ],
-    "max-payload-size-unreliable" : "8352",
-    "routing":"routingmanagerd",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.77.1",
-        "port":"30490",
-        "protocol":"udp",
-        "cyclic_offer_delay" : "1000"
-    }
-}
diff --git a/test/someip_tp_tests/someip_tp_test_master_starter.sh b/test/someip_tp_tests/someip_tp_test_master_starter.sh
deleted file mode 100755
index 984ee43..0000000
--- a/test/someip_tp_tests/someip_tp_test_master_starter.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2015-2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-FAIL=0
-
-if [ $# -lt 1 ]
-then
-    echo "Please pass a test mode to this script."
-    echo "For example: $0 IN_SEQUENCE"
-    echo "Valid subscription types include:"
-    echo "            [IN_SEQUENCE, MIXED, INCOMPLETE, DUPLICATE, OVERLAP, OVERLAP_FRONT_BACK]"
-    exit 1
-fi
-TESTMODE=$1
-export VSOMEIP_CONFIGURATION=someip_tp_test_master.json
-# start daemon
-../examples/routingmanagerd/./routingmanagerd &
-PID_VSOMEIPD=$!
-# Start the services
-./someip_tp_test_service $1 &
-PID_SERIVCE=$!
-
-sleep 1
-
-if [ ! -z "$USE_LXC_TEST" ]; then
-    echo "Waiting for 5s"
-    sleep 5
-    ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip_lib/test; ./someip_tp_test_msg_sender XXX.XXX.XXX.XXX XXX.XXX.XXX.XXX $TESTMODE\"" &
-    echo "remote ssh pid: $!"
-elif [ ! -z "$USE_DOCKER" ]; then
-    echo "Waiting for 5s"
-    sleep 5
-    docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./someip_tp_test_msg_sender XXX.XXX.XXX.XXX XXX.XXX.XXX.XXX $TESTMODE" &
-else
-cat <<End-of-message
-*******************************************************************************
-*******************************************************************************
-** Please now run:
-** someip_tp_test_msg_sender XXX.XXX.XXX.XXX XXX.XXX.XXX.XXX $TESTMODE
-** from an external host to successfully complete this test.
-**
-** You probably will need to adapt the 'unicast' settings in
-** someip_tp_test_master.json to your personal setup.
-*******************************************************************************
-*******************************************************************************
-End-of-message
-fi
-
-# Wait until all clients and services are finished
-for job in $PID_SERIVCE
-do
-    # Fail gets incremented if a client exits with a non-zero exit code
-    echo "waiting for $job"
-    wait $job || FAIL=$(($FAIL+1))
-done
-
-# kill the services
-kill $PID_VSOMEIPD
-sleep 1
-
-# Check if everything went well
-exit $FAIL
diff --git a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_master_udp.json b/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_master_udp.json
deleted file mode 100644
index 8413dda..0000000
--- a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_master_udp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"subscribe_notify_test_service_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"subscribe_notify_test_service_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"subscribe_notify_test_service_three",
-            "id":"0x3333"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1111",
-            "instance":"0x0001",
-            "unreliable":"30001"
-        },
-        {
-            "service":"0x2222",
-            "instance":"0x0001",
-            "unreliable":"30002"
-        },
-        {
-            "service":"0x3333",
-            "instance":"0x0001",
-            "unreliable":"30003"
-        }
-    ],
-    "routing":"subscribe_notify_test_service_one",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_same_service_id_master_udp.json b/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_same_service_id_master_udp.json
deleted file mode 100644
index bb2280c..0000000
--- a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_same_service_id_master_udp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"subscribe_notify_test_service_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"subscribe_notify_test_service_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"subscribe_notify_test_service_three",
-            "id":"0x3333"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1111",
-            "instance":"0x0001",
-            "unreliable":"30001"
-        },
-        {
-            "service":"0x1111",
-            "instance":"0x0002",
-            "unreliable":"30002"
-        },
-        {
-            "service":"0x1111",
-            "instance":"0x0003",
-            "unreliable":"30003"
-        }
-    ],
-    "routing":"subscribe_notify_test_service_one",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_same_service_id_slave_udp.json b/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_same_service_id_slave_udp.json
deleted file mode 100644
index d07c1e3..0000000
--- a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_same_service_id_slave_udp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"subscribe_notify_test_service_four",
-            "id":"0x4444"
-        },
-        {
-            "name":"subscribe_notify_test_service_five",
-            "id":"0x5555"
-        },
-        {
-            "name":"subscribe_notify_test_service_six",
-            "id":"0x6666"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x2222",
-            "instance":"0x0001",
-            "unreliable":"30004"
-        },
-        {
-            "service":"0x2222",
-            "instance":"0x0002",
-            "unreliable":"30005"
-        },
-        {
-            "service":"0x2222",
-            "instance":"0x0003",
-            "unreliable":"30006"
-        }
-    ],
-    "routing":"subscribe_notify_test_service_four",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_slave_udp.json b/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_slave_udp.json
deleted file mode 100644
index bda8fe0..0000000
--- a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_diff_ports_slave_udp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"subscribe_notify_test_service_four",
-            "id":"0x4444"
-        },
-        {
-            "name":"subscribe_notify_test_service_five",
-            "id":"0x5555"
-        },
-        {
-            "name":"subscribe_notify_test_service_six",
-            "id":"0x6666"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x4444",
-            "instance":"0x0001",
-            "unreliable":"30004"
-        },
-        {
-            "service":"0x5555",
-            "instance":"0x0001",
-            "unreliable":"30005"
-        },
-        {
-            "service":"0x6666",
-            "instance":"0x0001",
-            "unreliable":"30006"
-        }
-    ],
-    "routing":"subscribe_notify_test_service_four",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_same_ports_master_udp.json b/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_same_ports_master_udp.json
deleted file mode 100644
index 649d1ba..0000000
--- a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_same_ports_master_udp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"subscribe_notify_test_service_one",
-            "id":"0x1111"
-        },
-        {
-            "name":"subscribe_notify_test_service_two",
-            "id":"0x2222"
-        },
-        {
-            "name":"subscribe_notify_test_service_three",
-            "id":"0x3333"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x1111",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x2222",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x3333",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        }
-    ],
-    "routing":"subscribe_notify_test_service_one",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}
diff --git a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_same_ports_slave_udp.json b/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_same_ports_slave_udp.json
deleted file mode 100644
index 314737f..0000000
--- a/test/subscribe_notify_tests/subscribe_notify_test_diff_client_ids_same_ports_slave_udp.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "unicast":"XXX.XXX.XXX.XXX",
-    "logging":
-    {
-        "level":"warning",
-        "console":"true",
-        "file":
-        {
-            "enable":"false",
-            "path":"/tmp/vsomeip.log"
-        },
-        "dlt":"false"
-    },
-    "applications":
-    [
-        {
-            "name":"subscribe_notify_test_service_four",
-            "id":"0x4444"
-        },
-        {
-            "name":"subscribe_notify_test_service_five",
-            "id":"0x5555"
-        },
-        {
-            "name":"subscribe_notify_test_service_six",
-            "id":"0x6666"
-        }
-    ],
-    "services":
-    [
-        {
-            "service":"0x4444",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x5555",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        },
-        {
-            "service":"0x6666",
-            "instance":"0x0001",
-            "unreliable":"30000"
-        }
-    ],
-    "routing":"subscribe_notify_test_service_four",
-    "service-discovery":
-    {
-        "enable":"true",
-        "multicast":"224.0.0.1",
-        "port":"30490",
-        "protocol":"udp",
-        "initial_delay_min" : "10",
-        "initial_delay_max" : "10",
-        "repetitions_base_delay" : "30",
-        "repetitions_max" : "3",
-        "cyclic_offer_delay" : "1000",
-        "ttl" : "3"
-    }
-}