mw/com: Remove SOME/IP configuration structs

score/mw/com/design/configuration/README.md

@@ -2,8 +2,7 @@
 
 The main configuration items we have to deal with in `mw::com` are mappings from "logical" service instances to real
 existing service instances with their concrete used technical binding.
-Currently, we prepare our configuration to support the following technical bindings:
-- SOME/IP
+Currently, our configuration supports the following technical bindings:
 - Shared Memory IPC
 
 Of course, we do foresee arbitrary extensions.
@@ -36,13 +35,12 @@ The `ServiceTypeDeployment` aka `Service Interface Deployment` in AUTOSAR speech
 The binding independent `ServiceType` is defined within AUTOSAR metamodel by its Service Interface and its
 corresponding [service type identification](#service-type-identification).
 So within the configuration we might need to express, how a certain abstract `ServiceType` shall be represented in a
-`SOME/IP` or a `LoLa` binding. For instance, both bindings might use their own, distinct service ID
-for identification and also the embedded service parts (events, fields, methods) might have different identification and
-properties between a `SOME/IP` and a `LoLa` binding.
+`LoLa` binding. For instance, the binding uses its own distinct service ID
+for identification and also configuration of the embedded service parts (events, fields, methods).
 
 Note here, that these `ServiceTypeDeployment`s are independent of their concrete instances! E.g. an AUTOSAR service
-`/a/b/c/InterfaceName` will be once mapped to a `SOME/IP` service id **_SIDn_** and this applies then to ALL instances of
-this `/a/b/c/InterfaceName` service with a `SOME/IP` mapping!
+`/a/b/c/InterfaceName` will be once mapped to a `LoLa` service id **_SIDn_** and this applies then to ALL instances of
+this `/a/b/c/InterfaceName` service with a `LoLa` mapping!
 
 ### `ServiceInstanceDeployment`
 The `ServiceInstanceDeployment` maps concrete instances (identified by an [Instance Specifier](#instance-specifiers)) of
@@ -69,8 +67,7 @@ config artifacts with the applications.
 
 For `ServiceTypeDeployment` this is not so clear. In case of `ServiceTypeDeployments` for local only communication,
 which is the case of our `LoLa` binding, it is also the job of the ECU integrator, as it is only a local ECU
-optimization. Without any effect to the boardnet. In case of `SOME/IP` `ServiceTypeDeployments`, it might be expected
-for the future, that parts of `ServiceTypeDeployment` come from central toolchains (Symphony).
+optimization. Without any effect to the boardnet.
 
 ## Instance Specifiers
 
@@ -184,8 +181,8 @@ instances.
 What is **not** visible here: Whether `"abc/abc/TirePressurePort"` is a provided or required service instance. Both
 could be possible, since we do support 1 to n mappings in both cases.
 Here we have a mapping of `"abc/abc/TirePressurePort"` to two different concrete technical instances: The first one is a
-SOME/IP based instance (so it is most likely used for inter ECU, network communication) and the second is a concrete
-instance based on our shared memory IPC for ECU local communication.
+hypothetical SOME/IP based instance (so it is most likely used for inter-ECU network communication) and the second is a
+concrete instance based on our shared-memory IPC for ECU-local communication.
 
 #### C++ representation of configuration and mappings
 The JSON representation of the configuration shown above gets read and parsed at application startup within call to one

score/mw/com/design/configuration/structural_view.puml

@@ -26,11 +26,6 @@ package "configuration" {
     + ToString() : std::string const&
   }
 
-  class "score::mw::com::impl::SomeIpServiceInstanceDeployment" {
-    + instanceId: score::cpp::optional<std::uint16_t> const
-    + ToString() const : std::string
-  }
-
   class "score::mw::com::impl::LolaServiceInstanceDeployment" {
     + events : std::unordered_map<std::string, LolaEventInstanceDeployment> const
     + fields : std::unordered_map<std::string, LolaFieldInstanceDeployment> const
@@ -47,7 +42,7 @@ package "configuration" {
   class "score::mw::com::impl::ServiceInstanceDeployment" {
     + service: ServiceIdentifierType
     + asilLevel: QualityType
-    + bindingInfo_ : std::variant<LolaServiceInstanceDeployment, SomeIpServiceInstanceDeployment, FakeBindingInformation, score::cpp::blank> const
+    + bindingInfo_ : std::variant<LolaServiceInstanceDeployment, FakeBindingInformation, score::cpp::blank> const
     + ServiceInstanceDeployment(service : ServiceIdentifierType const, binding : BindingInformation, asil_level: QualityType const)
     + ToString() : std::string const
   }
@@ -224,7 +219,6 @@ class "score::mw::com::impl::Runtime" {
 "score::mw::com::impl::ServiceInstanceDeployment" *-- "QualityType"
 "score::mw::com::impl::ServiceInstanceDeployment" *-- "score::mw::com::ServiceIdentifierType"
 "score::mw::com::impl::ServiceInstanceDeployment" *-- "score::mw::com::impl::LolaServiceInstanceDeployment"
-"score::mw::com::impl::ServiceInstanceDeployment" *-- "score::mw::com::impl::SomeIpServiceInstanceDeployment"
 "score::mw::com::impl::LolaServiceInstanceDeployment" *-- "score::mw::com::impl::LolaEventInstanceDeployment" : 0..1
 "score::mw::com::impl::LolaServiceInstanceDeployment" *-- "score::mw::com::impl::LolaFieldInstanceDeployment" : 0..1
 "score::mw::com::impl::LolaServiceInstanceDeployment" *-- "score::mw::com::impl::LolaMethodInstanceDeployment" : 0..1

score/mw/com/impl/configuration/BUILD

@@ -51,7 +51,6 @@ cc_library(
         ":lola_service_instance_deployment",
         ":quality_type",
         ":service_type_deployment",
-        ":someip_service_instance_deployment",
         "@score_baselibs//score/mw/log",
         "@score_baselibs//score/quality/compiler_warnings",
     ],
@@ -152,18 +151,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "someip_event_instance_deployment",
-    srcs = ["someip_event_instance_deployment.cpp"],
-    hdrs = ["someip_event_instance_deployment.h"],
-    features = COMPILER_WARNING_FEATURES,
-    tags = ["FFI"],
-    visibility = [
-        "//score/mw/com/impl/configuration:__subpackages__",
-    ],
-    deps = ["@score_baselibs//score/json"],
-)
-
 cc_library(
     name = "lola_event_id",
     srcs = ["lola_event_id.cpp"],
@@ -219,15 +206,6 @@ cc_library(
     deps = [":lola_event_instance_deployment"],
 )
 
-cc_library(
-    name = "someip_field_instance_deployment",
-    srcs = ["someip_field_instance_deployment.cpp"],
-    hdrs = ["someip_field_instance_deployment.h"],
-    features = COMPILER_WARNING_FEATURES,
-    tags = ["FFI"],
-    deps = ["@score_baselibs//score/json"],
-)
-
 cc_library(
     name = "lola_method_instance_deployment",
     srcs = ["lola_method_instance_deployment.cpp"],
@@ -283,16 +261,6 @@ cc_library(
     deps = ["@score_baselibs//score/json"],
 )
 
-cc_library(
-    name = "someip_service_instance_id",
-    srcs = ["someip_service_instance_id.cpp"],
-    hdrs = ["someip_service_instance_id.h"],
-    features = COMPILER_WARNING_FEATURES,
-    implementation_deps = [":configuration_common_resources"],
-    tags = ["FFI"],
-    deps = ["@score_baselibs//score/json"],
-)
-
 cc_library(
     name = "service_identifier_type",
     srcs = ["service_identifier_type.cpp"],
@@ -318,7 +286,6 @@ cc_library(
         ":lola_service_instance_deployment",
         ":quality_type",
         ":service_identifier_type",
-        ":someip_service_instance_deployment",
         "//score/mw/com/impl:binding_type",
         "//score/mw/com/impl:error",
         "//score/mw/com/impl:instance_specifier",
@@ -336,7 +303,6 @@ cc_library(
     deps = [
         ":configuration_common_resources",
         ":lola_service_instance_id",
-        ":someip_service_instance_id",
         "@score_baselibs//score/json",
         "@score_baselibs//score/language/futurecpp",
     ],
@@ -369,23 +335,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "someip_service_instance_deployment",
-    srcs = ["someip_service_instance_deployment.cpp"],
-    hdrs = ["someip_service_instance_deployment.h"],
-    features = COMPILER_WARNING_FEATURES,
-    tags = ["FFI"],
-    deps = [
-        ":configuration_common_resources",
-        ":someip_event_instance_deployment",
-        ":someip_field_instance_deployment",
-        ":someip_service_instance_id",
-        "@score_baselibs//score/json",
-        "@score_baselibs//score/language/futurecpp",
-        "@score_baselibs//score/result",
-    ],
-)
-
 cc_library(
     name = "binding_service_type_deployment",
     srcs = ["binding_service_type_deployment.cpp"],
@@ -444,7 +393,6 @@ cc_library(
         ":service_type_deployment",
         ":service_version_type",
         ":shm_size_calc_mode",
-        ":someip_service_instance_deployment",
     ],
 )
 
@@ -596,16 +544,6 @@ cc_unit_test(
     ],
 )
 
-cc_unit_test(
-    name = "someip_service_instance_deployment_test",
-    srcs = ["someip_service_instance_deployment_test.cpp"],
-    features = COMPILER_WARNING_FEATURES,
-    deps = [
-        ":someip_service_instance_deployment",
-        "//score/mw/com/impl/configuration/test:configuration_test_resources",
-    ],
-)
-
 cc_unit_test(
     name = "lola_service_type_deployment_test",
     srcs = ["lola_service_type_deployment_test.cpp"],
@@ -636,16 +574,6 @@ cc_unit_test(
     ],
 )
 
-cc_unit_test(
-    name = "someip_service_instance_id_test",
-    srcs = ["someip_service_instance_id_test.cpp"],
-    features = COMPILER_WARNING_FEATURES,
-    deps = [
-        ":someip_service_instance_deployment",
-        "//score/mw/com/impl/configuration/test:configuration_test_resources",
-    ],
-)
-
 cc_unit_test(
     name = "global_configuration_test",
     srcs = ["global_configuration_test.cpp"],
@@ -664,20 +592,6 @@ cc_unit_test(
     ],
 )
 
-cc_unit_test(
-    name = "someip_field_instance_deployment_test",
-    srcs = ["someip_field_instance_deployment_test.cpp"],
-    features = COMPILER_WARNING_FEATURES,
-    deps = [":someip_field_instance_deployment"],
-)
-
-cc_unit_test(
-    name = "someip_event_instance_deployment_test",
-    srcs = ["someip_event_instance_deployment_test.cpp"],
-    features = COMPILER_WARNING_FEATURES,
-    deps = [":someip_event_instance_deployment"],
-)
-
 cc_unit_test(
     name = "shm_size_calc_mode_test",
     srcs = ["shm_size_calc_mode_test.cpp"],

score/mw/com/impl/configuration/README.md

@@ -88,14 +88,13 @@ exist, but has no functional effect yet!
 Our `mw::com` architecture foresees, that a `service-type` might be provided via several technical transport mechanisms,
 which we call a `binding`. The decision, which technical transport mechanisms to be used is finally taken by the
 `service-instances`. I.e. a `service-instance` might be configured to support an ECU local
-transport mechanism, like our shared-memory based mechanism, and also a network based mechanism (like `SOME/IP`) to
+transport mechanism, like our shared-memory based mechanism, and also a network based mechanism to
 support cross-ECU communication.
 
 However, the `service-type` on which the `service-instance` is based on, needs to support the technical transport
 mechanism (`binding`) and needs to configure the instance `independent` parts of the binding.
 
 Currently, the only supported binding is the shared-memory binding, which is represented as `SHM` in the json.
-The other binding `SOME/IP`, which the schema allows, is only a placeholder right now.
 In the corresponding snippet from our example configuration:
 
     "bindings": [

score/mw/com/impl/configuration/config_parser.cpp

@@ -101,7 +101,6 @@ constexpr auto kNumberOfIpcTracingSlotsDefault = static_cast<NumberOfIpcTracingS
 
 constexpr auto kPermissionChecksKey = "permission-checks"sv;
 
-constexpr auto kSomeIpBinding = "SOME/IP"sv;
 constexpr auto kShmBinding = "SHM"sv;
 constexpr auto kShmSizeCalcModeSimulation = "SIMULATION"sv;
 
@@ -705,12 +704,7 @@ auto ParseServiceInstanceDeployments(const score::json::Object& json_map,
             SCORE_LANGUAGE_FUTURECPP_PRECONDITION_PRD_MESSAGE(bindingValue_result.has_value(),
                                                               "Configuration corrupted, check with json schema");
             const auto& bindingValue = bindingValue_result.value().get();
-            if (bindingValue == kSomeIpBinding)
-            {
-                score::mw::log::LogFatal("lola") << "Provided SOME/IP binding, which can not be parsed.";
-                SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(false);
-            }
-            else if (bindingValue == kShmBinding)
+            if (bindingValue == kShmBinding)
             {
                 // Return Value not needed in this context
                 score::cpp::ignore = deployments.emplace_back(service,
@@ -1025,10 +1019,6 @@ auto ParseServiceTypeDeployment(const score::json::Object& json_map) -> ServiceT
             LolaServiceTypeDeployment lola_deployment = ParseLoLaServiceTypeDeployments(binding_map);
             return ServiceTypeDeployment{lola_deployment};
         }
-        else if (value == kSomeIpBinding)
-        {
-            // we skip this, because we don't support SOME/IP right now.
-        }
         else
         {
             score::mw::log::LogFatal("lola") << "No unknown binding provided. Required argument.";

score/mw/com/impl/configuration/config_parser_test.cpp

@@ -1056,7 +1056,7 @@ TEST_F(ConfigParserFixture, DuplicateServiceInstanceWillDie)
             "instances": [
                 {
                   "asil-level": "QM",
-                  "binding": "SOME/IP"
+                  "binding": "SHM"
                 }
             ]
         }
@@ -2477,61 +2477,6 @@ TEST(ConfigParser, InvalidQualityTypeForAllowedConsumersWillDie)
     SCORE_LANGUAGE_FUTURECPP_EXPECT_CONTRACT_VIOLATED(score::mw::com::impl::configuration::Parse(std::move(j2)));
 }
 
-TEST(ConfigParser, TerminateOnParsingSomeIP)
-{
-    // Give a SOME/IP binding configuration
-    auto config_with_some_ip_binding = R"(
-    {
-        "serviceTypes": [
-            {
-            "serviceTypeName": "/score/ncar/services/TirePressureService",
-            "version": {
-                "major": 12,
-                "minor": 34
-            },
-            "bindings": [
-                {
-                "serviceId": 1234,
-                "binding": "SOME/IP",
-                "events": [],
-                "fields": []
-                }
-            ]
-            }
-        ],
-        "serviceInstances": [
-            {
-                "instanceSpecifier": "abc/abc/TirePressurePort",
-                "serviceTypeName": "/score/ncar/services/TirePressureService",
-                "version": {
-                    "major": 12,
-                    "minor": 34
-                },
-                "instances": [
-                    {
-                    "instanceId": 1,
-                    "asil-level": "B",
-                    "binding": "SOME/IP",
-                    "events": [],
-                    "fields": []
-                    }
-                ]
-            }
-        ],
-        "global": {
-        "asil-level": "B"
-        }
-    }
-    )";
-    const score::json::JsonParser json_parser_obj;
-    auto json = json_parser_obj.FromBuffer(config_with_some_ip_binding);
-
-    // When parsing such a configuration
-    // Fail and abort
-    SCORE_LANGUAGE_FUTURECPP_EXPECT_CONTRACT_VIOLATED(
-        score::mw::com::impl::configuration::Parse(std::move(json).value()));
-}
-
 class ShmSizeCalcMode : public ::testing::TestWithParam<std::tuple<std::string, ShmSizeCalculationMode>>
 {
 };

score/mw/com/impl/configuration/configuration_error.h

@@ -27,8 +27,6 @@ enum class configuration_errc : score::result::ErrorCode
     serialization_deploymentinformation_invalid = 0,
     serialization_no_shmbindinginformation = 1,
     serialization_shmbindinginformation_invalid = 2,
-    serialization_someipbindinginformation_invalid = 3,
-    serialization_no_someipbindinginformation = 4,
 };
 
 /// \brief See above explanation in configuration_errc
@@ -61,13 +59,6 @@ class ConfigurationErrorDomain final : public score::result::ErrorDomain
             case static_cast<score::result::ErrorCode>(configuration_errc::serialization_shmbindinginformation_invalid):
                 return "serialization of <LoLaShmBindingInfo> is invalid";
             // coverity[autosar_cpp14_m6_4_5_violation]
-            case static_cast<score::result::ErrorCode>(configuration_errc::serialization_no_someipbindinginformation):
-                return "no serialization of <SomeIpBindingInfo>";
-            // coverity[autosar_cpp14_m6_4_5_violation]
-            case static_cast<score::result::ErrorCode>(
-                configuration_errc::serialization_someipbindinginformation_invalid):
-                return "serialization of <SomeIpBindingInfo> is invalid";
-            // coverity[autosar_cpp14_m6_4_5_violation]
             default:
                 return "unknown configuration error";
         }