Refactor network manager by MykolaSuperman · Pull Request #528 · aosedge/aos_core_lib_cpp

MykolaSuperman · 2026-03-06T10:10:20Z

No description provided.

codecov · 2026-03-06T10:35:28Z

Codecov Report

❌ Patch coverage is 91.26731% with 82 lines in your changes missing coverage. Please review.
✅ Project coverage is 85.17%. Comparing base (79d1152) to head (af7d8f3).

Files with missing lines	Patch %	Lines
src/core/sm/networkmanager/networkmanager.cpp	77.77%	80 Missing ⚠️
...rc/core/sm/networkmanager/tests/networkmanager.cpp	99.57%	2 Missing ⚠️

Additional details and impacted files

@@                   Coverage Diff                   @@
##           feature_release_9.1     #528      +/-   ##
=======================================================
- Coverage                85.25%   85.17%   -0.08%     
=======================================================
  Files                      311      309       -2     
  Lines                    27938    27965      +27     
  Branches                  3762     3745      -17     
=======================================================
+ Hits                     23819    23820       +1     
- Misses                    4119     4145      +26

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

al1img · 2026-03-11T14:18:12Z

src/core/common/network/itf/networkprovider.hpp

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2025 EPAM Systems, Inc.


al1img · 2026-03-11T14:21:08Z

src/core/common/networkmanager/itf/networkprovider.hpp

+/**
+ * Network provider interface (SM -> CM network service).
+ */
+class NetworkProviderItf {


Add unit test for this interface and network.md file that describes the purpose if this interfae.

al1img · 2026-03-11T14:48:00Z

src/core/common/network/itf/networkprovider.hpp

+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef AOS_CORE_COMMON_NETWORK_ITF_NETWORKPROVIDER_HPP_


As it is part of networkmanager then it should be in networkmanager folder and networkmanager namespace.

al1img · 2026-03-11T14:52:18Z

src/core/cm/launcher/balancer.cpp


 void Balancer::Init(InstanceManager& instanceManager, imagemanager::ItemInfoProviderItf& itemInfoProvider,
    oci::OCISpecItf& ociSpec, NodeManager& nodeManager, MonitoringProviderItf& monitorProvider,
-    InstanceRunnerItf& runner, NetworkManager& networkManager)


Do launcher unit tests work after these changes?

al1img · 2026-03-11T15:29:31Z

src/core/common/types/network.hpp

-    StaticString<cSubnetLen>   mSubnet;
-    StaticString<cIPLen>       mIP;
-    uint64_t                   mVlanID {};
+struct NetworkServiceData {


We don't have services any more. Rename to UpdateItemNetworkParameters.

Shortcut parameters to params:

NetworkParams InstanceNetworkParams UpdateItemNetworkParams

Can InstanceNetworkParams have the following fields:

struct InstanceNetworkParams { NetworkParams mNetworkParams; StaticArray<StaticString<cIPLen>, cMaxNumDNSServers> mDNSServers; StaticArray<FirewallRule, cMaxNumFirewallRules> mFirewallRules; ...

?

al1img · 2026-03-11T15:48:48Z

src/core/sm/networkmanager/itf/networkmanager.hpp

-     * @param networks network parameters.
-     * @return Error.
+     * @param period traffic period.
+     * @return Error


period at the end

al1img · 2026-03-11T15:49:37Z

src/core/sm/networkmanager/networkmanager.cpp

-    LOG_DBG() << "Update networks";
+    LOG_DBG() << "Get system traffic";
+
+    return AOS_ERROR_WRAP(mNetMonitor->GetSystemTraffic(inputTraffic, outputTraffic));


Do not put operators in macro. It reduces readability.

al1img · 2026-03-11T15:49:42Z

src/core/sm/networkmanager/networkmanager.cpp

+{
+    LOG_DBG() << "Get instance traffic" << Log::Field("instanceID", instanceID);
+
+    return AOS_ERROR_WRAP(mNetMonitor->GetInstanceTraffic(instanceID, inputTraffic, outputTraffic));


al1img · 2026-03-11T15:51:21Z

src/core/sm/networkmanager/networkmanager.hpp

     */
    Error SetTrafficPeriod(TrafficPeriod period) override;

+    Error PrepareInstanceNetwork(const String& instanceID, const String& networkID,


Comment public API

al1img · 2026-03-11T15:51:26Z

src/core/sm/networkmanager/networkmanager.hpp

+    Error PrepareInstanceNetwork(const String& instanceID, const String& networkID,
+        const InstanceNetworkParameters& instanceNetworkParameters, const NetworkServiceData& serviceData) override;
+
+    Error CleanupInstanceNetwork(


al1img · 2026-03-20T08:25:12Z

src/core/sm/networkmanager/itf/types.hpp

+/**
+ * Instance network runtime parameters for Start (not stored in DB).
+ */
+struct InstanceNetworkRuntimeParameters {


InstanceNetworkRuntimeParams

- NetworkParameters -> NetworkParams - InstanceNetworkParameters -> InstanceNetworkAllocation - UpdateNetworkParameters -> UpdateItemNetworkParams (NetworkServiceData) Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

Add network provider interface for SM to communicate with CM for network allocation and release operations. Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

- Remove CM networkmanager module (moved to SM-driven model) - Update CM launcher to remove network management - Update smcontroller to use NetworkProviderItf Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

Add types.hpp with: - InstanceNetworkConfig: network config for Create (stored in DB) - InstanceNetworkRuntimeParameters: runtime paths for Start Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

Replace PrepareInstanceNetwork/CleanupInstanceNetwork with 4 methods: - CreateInstanceNetwork: CM allocation + DB (idempotent) - StartInstanceNetwork: physical setup from cached params - StopInstanceNetwork: physical cleanup, clears bridge/VLAN if last - ReleaseInstanceNetwork: DB + CM release, requires Stop first Key changes: - InstanceNetworkInfo extended with InstanceNetworkConfig and InstanceNetworkAllocation for offline Start after reboot - Init no longer removes instance network info from DB - Init no longer creates bridge/VLAN (deferred to Start) - EnsureNodeNetwork split into logical (CM) and physical parts - Thread-safe access to mInstanceNetworkInfos cache - networkID validation in Start/Stop/Release Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

- Update all NM tests to use Create+Start / Stop+Release - Add tests: networkID mismatch, Release without Stop, idempotent Create - Update NetworkManagerMock with 4 methods - Add NetworkProviderMock - Update launcher tests for new API Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

- Add PendingFirewallUpdate struct to network.hpp (instanceIdent + firewall rules) - Add PendingUpdateHandlerItf to networkprovider.hpp for deferred firewall update notifications between CM and SM - Add PendingUpdateHandlerMock for testing Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

- Add UpdateFirewall to CNIItf interface for firewall-only CNI updates (DEL old + ADD new rules while preserving bridge/DNS/bandwidth cache) - Update CNIMock with UpdateFirewall Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

- NetworkManagerItf inherits PendingUpdateHandlerItf - Add OnPendingFirewallUpdate: receives resolved pending rules from CM, updates storage and RAM cache atomically (storage first), applies firewall-only CNI update for running instances - Add UpdateInstanceFirewall: retrieves cached CNI config, rebuilds firewall plugin config, calls CNI::UpdateFirewall - Validate nodeID matches before processing update - Update NetworkManagerMock with OnPendingFirewallUpdate Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

- OnPendingFirewallUpdate_UpdatesFirewallRules: notification updates rules in storage for non-running instance - OnPendingFirewallUpdate_RunningInstance_CallsCNIUpdate: notification triggers CNI UpdateFirewall for running instance Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

sonarqubecloud · 2026-03-25T15:37:29Z

Quality Gate passed

Issues
45 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

MykolaSuperman force-pushed the refactor_network_manager branch from 529ffc6 to f022560 Compare March 6, 2026 10:21

MykolaSuperman force-pushed the refactor_network_manager branch 7 times, most recently from b90964f to 1aede72 Compare March 9, 2026 11:03

al1img reviewed Mar 11, 2026

View reviewed changes

MykolaSuperman force-pushed the refactor_network_manager branch 5 times, most recently from c3523c3 to 3d896e4 Compare March 18, 2026 14:27

al1img reviewed Mar 20, 2026

View reviewed changes

MykolaSuperman force-pushed the refactor_network_manager branch 3 times, most recently from 1a1bfd6 to 550fa1e Compare March 20, 2026 14:24

common: rename network types

3c2a987

- NetworkParameters -> NetworkParams - InstanceNetworkParameters -> InstanceNetworkAllocation - UpdateNetworkParameters -> UpdateItemNetworkParams (NetworkServiceData) Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

MykolaSuperman force-pushed the refactor_network_manager branch from f844bfb to 5c3686d Compare March 25, 2026 14:52

Mykola Solianko added 9 commits March 25, 2026 16:54

common: add NetworkProviderItf

6c1fc00

Add network provider interface for SM to communicate with CM for network allocation and release operations. Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

cm: remove networkmanager module, update launcher and smcontroller

c2501d1

- Remove CM networkmanager module (moved to SM-driven model) - Update CM launcher to remove network management - Update smcontroller to use NetworkProviderItf Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

sm: networkmanager: add InstanceNetworkConfig and runtime types

879d0da

Add types.hpp with: - InstanceNetworkConfig: network config for Create (stored in DB) - InstanceNetworkRuntimeParameters: runtime paths for Start Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

sm: cni: add UpdateFirewall method

8c651eb

- Add UpdateFirewall to CNIItf interface for firewall-only CNI updates (DEL old + ADD new rules while preserving bridge/DNS/bandwidth cache) - Update CNIMock with UpdateFirewall Signed-off-by: Mykola Solianko <mykola_solianko@epam.com>

MykolaSuperman force-pushed the refactor_network_manager branch from 5c3686d to af7d8f3 Compare March 25, 2026 14:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor network manager#528

Refactor network manager#528
MykolaSuperman wants to merge 10 commits intoaosedge:feature_release_9.1from
MykolaSuperman:refactor_network_manager

MykolaSuperman commented Mar 6, 2026

Uh oh!

codecov bot commented Mar 6, 2026 •

edited

Loading

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 11, 2026

Uh oh!

al1img Mar 20, 2026

Uh oh!

sonarqubecloud bot commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

Conversation

MykolaSuperman commented Mar 6, 2026

Uh oh!

codecov bot commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Mar 25, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

codecov bot commented Mar 6, 2026 •

edited

Loading