This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 507c4cd12899b26acdd5ad9cff4eb91e4ddb1849 Merge: 538578366a7 b5fd39fca0d Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Thu Jan 15 10:09:09 2026 +0530 Merge branch '4.22' .../main/java/com/cloud/network/NetworkModel.java | 8 ++ .../main/java/com/cloud/network/addr/PublicIp.java | 7 +- .../engine/orchestration/NetworkOrchestrator.java | 2 +- .../orchestration/NetworkOrchestratorTest.java | 1 + .../java/com/cloud/network/dao/NetworkDaoImpl.java | 4 +- .../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +- .../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +- .../java/com/cloud/alert/AlertManagerImpl.java | 9 +- .../com/cloud/network/IpAddressManagerImpl.java | 4 +- .../com/cloud/network/Ipv6AddressManagerImpl.java | 2 +- .../java/com/cloud/network/NetworkModelImpl.java | 40 +++++-- .../com/cloud/network/guru/DirectNetworkGuru.java | 2 +- .../cloud/network/guru/PodBasedNetworkGuru.java | 5 +- .../com/cloud/network/guru/PrivateNetworkGuru.java | 6 +- .../com/cloud/network/guru/StorageNetworkGuru.java | 6 +- .../com/cloud/network/router/NicProfileHelper.java | 3 +- .../cloud/network/router/NicProfileHelperImpl.java | 11 +- .../com/cloud/network/Ipv6AddressManagerTest.java | 2 + .../com/cloud/network/MockNetworkModelImpl.java | 18 +++ .../java/com/cloud/vpc/MockNetworkModelImpl.java | 18 +++ setup/bindir/cloud-sysvmadm.in | 129 ++++++--------------- systemvm/agent/noVNC/app/ui.js | 60 ++++++++++ .../main/java/com/cloud/utils/net/NetUtils.java | 6 +- 23 files changed, 214 insertions(+), 134 deletions(-)
