Skip to content

SM feature #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
al1img merged 15 commits into from
Jun 24, 2025
Merged

SM feature #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d10ce37
sm: rmove reduntant files
Jun 17, 2025
ec55d44
sm: organize files according to mono repo templates
Jun 17, 2025
4ccc14e
sm: cmake: use add module cmake functions
Jun 17, 2025
395636f
sm: update includes according to mono repo pattern
Jun 17, 2025
46712da
sm: app: Use version macro from common
Jun 17, 2025
34b1fde
sm: database: Implement network instance table
Jun 17, 2025
4ef115f
sm: cni: Move create dir in call side
Jun 17, 2025
34ea5e6
sm: network: Check chain on empty before delete
Jun 17, 2025
f4dfb30
sm: database: Use macro for migration path
Jun 17, 2025
200c9b8
cmake: include core lib sm
Jun 17, 2025
dc2fae9
cmake: include sm component
Jun 17, 2025
400ba49
sm: change header guards naming
Jun 19, 2025
31f2425
common: update includes according to mono repo pattern
Jun 19, 2025
02bf8a4
mp: update includes according to mono repo pattern
Jun 19, 2025
ea87a2c
sm: fix cppcheck warnings
Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ add_subdirectory(src)
add_subdirectory(${AOS_CORE_API_DIR} aos_core_api)
add_subdirectory(${AOS_CORE_LIB_DIR}/src/common aos_core_lib/common)

if(WITH_SM)
Copy link
Collaborator

@al1img al1img Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add empty line before if

Copy link
Author

@MykolaSuperman MykolaSuperman Jun 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

add_subdirectory(${AOS_CORE_LIB_DIR}/src/sm aos_core_lib/sm)
endif()

if(WITH_MP OR WITH_IAM)
add_subdirectory(${AOS_CORE_LIB_DIR}/src/iam aos_core_lib/iam)
endif()
Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ endif()
if(WITH_CM)
add_subdirectory(cm)
endif()

if(WITH_SM)
add_subdirectory(sm)
endif()
4 changes: 2 additions & 2 deletions src/common/downloader/downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include <curl/curl.h>

#include "common/logger/logmodule.hpp"
#include "common/utils/exception.hpp"
#include <common/logger/logmodule.hpp>
#include <common/utils/exception.hpp>

#include "downloader.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/downloader/tests/downloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <aos/test/log.hpp>

#include "common/downloader/downloader.hpp"
#include <common/downloader/downloader.hpp>

#include "stubs/httpserverstub.hpp"

Expand Down
6 changes: 3 additions & 3 deletions src/common/iamclient/permservicehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include "common/logger/logmodule.hpp"
#include "common/pbconvert/common.hpp"
#include "common/utils/exception.hpp"
#include <common/logger/logmodule.hpp>
#include <common/pbconvert/common.hpp>
#include <common/utils/exception.hpp>

#include "permservicehandler.hpp"

Expand Down
8 changes: 4 additions & 4 deletions src/common/iamclient/publicservicehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include "common/logger/logmodule.hpp"
#include "common/pbconvert/common.hpp"
#include "common/utils/exception.hpp"
#include "common/utils/grpchelper.hpp"
#include <common/logger/logmodule.hpp>
#include <common/pbconvert/common.hpp>
#include <common/utils/exception.hpp>
#include <common/utils/grpchelper.hpp>

#include "publicservicehandler.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/iamclient/publicservicehandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <iamanager/v5/iamanager.grpc.pb.h>

#include "common/utils/grpchelper.hpp"
#include <common/utils/grpchelper.hpp>

namespace aos::common::iamclient {

Expand Down
6 changes: 3 additions & 3 deletions src/common/iamclient/tests/iamclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#include <aos/test/log.hpp>

#include "common/iamclient/permservicehandler.hpp"
#include "common/iamclient/publicservicehandler.hpp"
#include "common/tests/mocks/iamclientmock.hpp"
#include <common/iamclient/permservicehandler.hpp>
#include <common/iamclient/publicservicehandler.hpp>
#include <common/tests/mocks/iamclientmock.hpp>

#include "mocks/certhandlermock.hpp"
#include "stubs/iamserverstub.hpp"
Expand Down
6 changes: 3 additions & 3 deletions src/common/jsonprovider/jsonprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <Poco/JSON/Parser.h>

#include "common/utils/exception.hpp"
#include "common/utils/json.hpp"
#include "common/utils/time.hpp"
#include <common/utils/exception.hpp>
#include <common/utils/json.hpp>
#include <common/utils/time.hpp>

#include "jsonprovider.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/jsonprovider/tests/jsonprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <aos/test/log.hpp>

#include "common/jsonprovider/jsonprovider.hpp"
#include <common/jsonprovider/jsonprovider.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/logger/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <systemd/sd-journal.h>

#include "common/logger/logger.hpp"
#include "logger.hpp"

namespace aos::common::logger {

Expand Down
4 changes: 2 additions & 2 deletions src/common/logprovider/archivator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <Poco/Zip/Compress.h>

#include "common/logger/logmodule.hpp"
#include "common/utils/exception.hpp"
#include <common/logger/logmodule.hpp>
#include <common/utils/exception.hpp>

#include "archivator.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/logprovider/tests/archivator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include "common/logprovider/archivator.hpp"
#include <common/logprovider/archivator.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/migration/migration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <filesystem>
#include <fstream>

#include "common/utils/exception.hpp"
#include <common/utils/exception.hpp>

#include "migration.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/migration/tests/migration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <Poco/Data/SQLite/Connector.h>
#include <gtest/gtest.h>

#include "common/migration/migration.hpp"
#include <common/migration/migration.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/network/interfacemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <netlink/route/link/vlan.h>
#include <netlink/route/route.h>

#include "common/logger/logmodule.hpp"
#include <common/logger/logmodule.hpp>

#include "interfacemanager.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/network/iptables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <regex>
#include <sstream>

#include "common/utils/exception.hpp"
#include <common/utils/exception.hpp>

#include "iptables.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/network/namespacemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <aos/common/tools/memory.hpp>

#include "common/logger/logmodule.hpp"
#include <common/logger/logmodule.hpp>

#include "namespacemanager.hpp"

Expand Down
6 changes: 3 additions & 3 deletions src/common/ocispec/imagemanifest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <fstream>

#include "common/utils/exception.hpp"
#include "common/utils/json.hpp"
#include "common/utils/time.hpp"
#include <common/utils/exception.hpp>
#include <common/utils/json.hpp>
#include <common/utils/time.hpp>

#include "ocispec.hpp"

Expand Down
6 changes: 3 additions & 3 deletions src/common/ocispec/imagespec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <fstream>

#include "common/utils/exception.hpp"
#include "common/utils/json.hpp"
#include "common/utils/time.hpp"
#include <common/utils/exception.hpp>
#include <common/utils/json.hpp>
#include <common/utils/time.hpp>

#include "ocispec.hpp"

Expand Down
6 changes: 3 additions & 3 deletions src/common/ocispec/runtimespec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <fstream>

#include "common/utils/exception.hpp"
#include "common/utils/json.hpp"
#include "common/utils/time.hpp"
#include <common/utils/exception.hpp>
#include <common/utils/json.hpp>
#include <common/utils/time.hpp>

#include "ocispec.hpp"

Expand Down
6 changes: 3 additions & 3 deletions src/common/ocispec/serviceconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <fstream>

#include "common/utils/exception.hpp"
#include "common/utils/json.hpp"
#include "common/utils/time.hpp"
#include <common/utils/exception.hpp>
#include <common/utils/json.hpp>
#include <common/utils/time.hpp>

#include "ocispec.hpp"

Expand Down
4 changes: 2 additions & 2 deletions src/common/ocispec/tests/ocispec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <aos/common/tools/fs.hpp>
#include <aos/test/log.hpp>

#include "common/ocispec/ocispec.hpp"
#include "common/utils/json.hpp"
#include <common/ocispec/ocispec.hpp>
#include <common/utils/json.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/pbconvert/tests/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <aos/test/log.hpp>

#include "common/pbconvert/common.hpp"
#include <common/pbconvert/common.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/pbconvert/tests/iam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <aos/test/log.hpp>

#include "common/pbconvert/iam.hpp"
#include <common/pbconvert/iam.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/pbconvert/tests/sm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <aos/test/log.hpp>

#include "common/pbconvert/sm.hpp"
#include <common/pbconvert/sm.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/tests/mocks/iamclientmock.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <gmock/gmock.h>

#include "common/iamclient/publicservicehandler.hpp"
#include <common/iamclient/publicservicehandler.hpp>

namespace aos::common::iamclient {

Expand Down
4 changes: 2 additions & 2 deletions src/common/tests/utils/partition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

#include <Poco/String.h>

#include "aos/common/tools/string.hpp"
#include <aos/common/tools/string.hpp>

#include "common/utils/utils.hpp"
#include <common/utils/utils.hpp>

#include "partition.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/tests/channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <gtest/gtest.h>

#include "common/utils/channel.hpp"
#include <common/utils/channel.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/tests/cleanupmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <gtest/gtest.h>

#include "common/utils/cleanupmanager.hpp"
#include <common/utils/cleanupmanager.hpp>

namespace aos::common::utils::test {

Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/tests/exception.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <gtest/gtest.h>

#include "common/utils/exception.hpp"
#include <common/utils/exception.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/tests/filesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <aos/common/tools/fs.hpp>
#include <aos/test/log.hpp>

#include "common/utils/filesystem.hpp"
#include <common/utils/filesystem.hpp>

using namespace testing;

Expand Down
6 changes: 3 additions & 3 deletions src/common/utils/tests/fsplatform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <fstream>
#include <gtest/gtest.h>

#include "common/tests/utils/partition.hpp"
#include "common/utils/fsplatform.hpp"
#include "common/utils/utils.hpp"
#include <common/tests/utils/partition.hpp>
#include <common/utils/fsplatform.hpp>
#include <common/utils/utils.hpp>

namespace aos::common::utils::test {

Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/tests/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <Poco/Process.h>
#include <Poco/StreamCopier.h>

#include "common/utils/image.hpp"
#include <common/utils/image.hpp>

using namespace testing;

Expand Down
4 changes: 2 additions & 2 deletions src/common/utils/tests/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include "common/utils/grpchelper.hpp"
#include "common/utils/json.hpp"
#include <common/utils/grpchelper.hpp>
#include <common/utils/json.hpp>

using namespace testing;

Expand Down
2 changes: 1 addition & 1 deletion src/common/utils/tests/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <aos/test/log.hpp>

#include "common/utils/parser.hpp"
#include <common/utils/parser.hpp>

using namespace testing;

Expand Down
4 changes: 2 additions & 2 deletions src/common/utils/tests/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <aos/test/log.hpp>

#include "common/utils/exception.hpp"
#include "common/utils/time.hpp"
#include <common/utils/exception.hpp>
#include <common/utils/time.hpp>

using namespace testing;

Expand Down
6 changes: 3 additions & 3 deletions src/mp/app/app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#include <aos/common/version.hpp>

#include "common/logger/logmodule.hpp"
#include "common/utils/exception.hpp"
#include "common/version/version.hpp"
#include <common/logger/logmodule.hpp>
#include <common/utils/exception.hpp>
#include <common/version/version.hpp>

#include "app.hpp"

Expand Down
Loading
Loading