(cloudstack) branch main updated: NSX: add back removed code for NSX (#9435)

[nvazquez]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 3399abddb0c NSX: add back removed code for NSX (#9435)
3399abddb0c is described below

commit 3399abddb0c17b6d669bb1a14f62e4299d81a963
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Wed Aug 14 17:44:47 2024 +0200

    NSX: add back removed code for NSX (#9435)
    
    This code snippet has been removed in the merge forward of PR #9240
    in commit 90fe1d5fdcc2909130b5de6803b57feeff194f54
---
 .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java | 6 ++++++
 1 file changed, 6 insertions(+)

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 ea34f62ecd5..5c01bb4f288 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
@@ -1072,6 +1072,12 @@ public class NetworkOrchestrator extends ManagerBase 
implements NetworkOrchestra
                 return null;
             }
 
+            if (isNicAllocatedForNsxPublicNetworkOnVR(network, profile, vm)) {
+                String guruName = "NsxPublicNetworkGuru";
+                NetworkGuru nsxGuru = 
AdapterBase.getAdapterByName(networkGurus, guruName);
+                nsxGuru.allocate(network, profile, vm);
+            }
+
             if (isDefaultNic != null) {
                 profile.setDefaultNic(isDefaultNic);
             }