test fixes

Author: dmitry-gorokhov

src/plugins/intel_cpu/src/config.cpp

@@ -117,6 +117,20 @@ Config Config::clone(int sub_stream_idx, bool enable_node_split) const {
     return new_config;
 }
 
+void Config::set_properties(const ov::AnyMap& config, OptionVisibility allowed_visibility) {
+    const auto& it = config.find(ov::num_streams.name());
+    if (it != config.end()) {
+        auto num_streams = it->second.as<std::string>();
+        auto new_config = config;
+        new_config.at(ov::num_streams.name()) = num_streams;
+        PluginConfig::set_user_property(new_config, allowed_visibility);
+
+        return;
+    }
+
+    PluginConfig::set_user_property(config, allowed_visibility);
+}
+
 void Config::apply_rt_info(const IRemoteContext* context, const ov::RTMap& rt_info) {
     apply_rt_info_property(ov::hint::kv_cache_precision, rt_info);
     apply_rt_info_property(ov::hint::dynamic_quantization_group_size, rt_info);

src/plugins/intel_cpu/src/config.h

@@ -25,6 +25,8 @@ struct Config : public ov::PluginConfig {
     Config(const Config& other);
     Config& operator=(const Config& other);
 
+    void set_properties(const ov::AnyMap& config, OptionVisibility allowed_visibility = OptionVisibility::ANY);
+
 private:
     void finalize_impl(const IRemoteContext* context, const ov::Model* model) override;
     void apply_model_specific_options(const IRemoteContext* context, const ov::Model& model) override;

src/plugins/intel_cpu/src/plugin.cpp

@@ -176,7 +176,7 @@ std::shared_ptr<ov::ICompiledModel> Plugin::compile_model(const std::shared_ptr<
     DEBUG_LOG(PrintableModel(*cloned_model, "org_"));
 
     Config config = m_plugin_config;
-    config.set_user_property(properties, OptionVisibility::RELEASE);
+    config.set_properties(properties, OptionVisibility::RELEASE);
 
     Transformations transformations(cloned_model, config);
 
@@ -219,7 +219,7 @@ std::shared_ptr<ov::ICompiledModel> Plugin::compile_model(const std::shared_ptr<
 }
 
 void Plugin::set_property(const ov::AnyMap& config) {
-    m_plugin_config.set_user_property(config, OptionVisibility::RELEASE);
+    m_plugin_config.set_properties(config, OptionVisibility::RELEASE);
 }
 
 ov::Any Plugin::get_property(const std::string& name, const ov::AnyMap& options) const {
@@ -364,7 +364,9 @@ ov::Any Plugin::get_property(const std::string& name, const ov::AnyMap& options)
         return res;
     }
 
-    return m_plugin_config.get_property(name, OptionVisibility::RELEASE);
+    auto config = m_plugin_config;
+    config.finalize(get_default_context().get(), nullptr);
+    return config.get_property(name, OptionVisibility::RELEASE);
 }
 
 ov::SupportedOpsMap Plugin::query_model(const std::shared_ptr<const ov::Model>& model, const ov::AnyMap& properties) const {
@@ -375,7 +377,7 @@ ov::SupportedOpsMap Plugin::query_model(const std::shared_ptr<const ov::Model>&
     }
 
     Config config = m_plugin_config;
-    config.set_user_property(properties, OptionVisibility::RELEASE);
+    config.set_properties(properties, OptionVisibility::RELEASE);
     config.finalize(get_default_context().get(), model.get());
     auto context = std::make_shared<GraphContext>(config, fake_w_cache, false, false);
 
@@ -445,10 +447,8 @@ std::shared_ptr<ov::ICompiledModel> Plugin::import_model(std::istream& model_str
     deserializer >> model;
 
     Config config = m_plugin_config;
-    config.set_user_property(properties, OptionVisibility::RELEASE);
+    config.set_properties(_properties, OptionVisibility::RELEASE);
 
-    // import config props from caching model
-    // calculate_streams(config, model, true);
     config.finalize(get_default_context().get(), model.get());
 
     auto compiled_model = std::make_shared<CompiledModel>(model, shared_from_this(), config, loaded_from_cache);

src/plugins/intel_cpu/tests/functional/custom/behavior/ov_plugin/properties.cpp

@@ -285,11 +285,7 @@ TEST_F(OVClassConfigTestCPU, smoke_PluginSetConfigLogLevel) {
 
     // check throwing message
     auto property = ov::PropertyName(ov::log::level.name(), ov::PropertyMutability::RW);
-    const std::string expect_message = std::string("Wrong value DUMMY VALUE for property key ")  +
-        ov::log::level.name() + ". Expected only ov::log::Level::NO/ERR/WARNING/INFO/DEBUG/TRACE.";
-    OV_EXPECT_THROW(ie.set_property("CPU", {{property, "DUMMY VALUE"}}),
-            ov::Exception,
-            testing::HasSubstr(expect_message));
+    EXPECT_THROW(ie.set_property("CPU", {{property, "DUMMY VALUE"}}), ov::Exception);
 }
 
 TEST_F(OVClassConfigTestCPU, smoke_PluginCheckCPUExecutionDevice) {