(cloudstack) branch 4.22 updated: Clear System VM IP from NICs for PublicNetworkGuru (#11992)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.22 by this push:
     new 27bce46a8e3 Clear System VM IP from NICs for PublicNetworkGuru (#11992)
27bce46a8e3 is described below

commit 27bce46a8e34338c0bffebf3cfc5b6d0df9c729e
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Thu Mar 12 08:18:03 2026 -0400

    Clear System VM IP from NICs for PublicNetworkGuru (#11992)
---
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 31144296f60..51b28e6e2f9 100644
--- 
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ 
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2326,7 +2326,8 @@ public class NetworkOrchestrator extends ManagerBase 
implements NetworkOrchestra
             for (final NetworkElement element : networkElements) {
                 if (providersToImplement.contains(element.getProvider())) {
                     if 
(!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network),
 element.getProvider().getName())) {
-                        throw new CloudRuntimeException(String.format("Service 
provider %s either doesn't exist or is not enabled in physical network: %s", 
element.getProvider().getName(), 
_physicalNetworkDao.findById(network.getPhysicalNetworkId())));
+                        throw new CloudRuntimeException(String.format("Service 
provider %s either doesn't exist or is not enabled in physical network: %s",
+                                element.getProvider().getName(), 
_physicalNetworkDao.findById(network.getPhysicalNetworkId())));
                     }
                     if (element instanceof NetworkMigrationResponder) {
                         if (!((NetworkMigrationResponder) 
element).prepareMigration(profile, network, vm, dest, context)) {
@@ -2633,6 +2634,10 @@ public class NetworkOrchestrator extends ManagerBase 
implements NetworkOrchestra
 
         final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, 
network.getGuruName());
         guru.deallocate(network, profile, vm);
+        if (nic.getReservationStrategy() == Nic.ReservationStrategy.Create) {
+            applyProfileToNicForRelease(nic, profile);
+            _nicDao.update(nic.getId(), nic);
+        }
         if (BooleanUtils.isNotTrue(preserveNics)) {
             _nicDao.remove(nic.getId());
         }