[cloudstack] branch nsx-integration updated: add global setting to enable nsx plugin

[pearl11594]

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

pearl11594 pushed a commit to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/nsx-integration by this push:
     new 357f21780e7 add global setting to enable nsx plugin
357f21780e7 is described below

commit 357f21780e759d12a48c4c6e0d044a6cfe610f22
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Fri Aug 18 14:23:36 2023 -0400

    add global setting to enable nsx plugin
---
 .../engine/orchestration/service/NetworkOrchestrationService.java      | 3 +++
 .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
 
b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
index 6d7c540613b..90cfaf9335e 100644
--- 
a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
+++ 
b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
@@ -103,6 +103,9 @@ public interface NetworkOrchestrationService {
     static final ConfigKey<Boolean> TUNGSTEN_ENABLED = new 
ConfigKey<>(Boolean.class, "tungsten.plugin.enable", "Advanced", "false",
             "Indicates whether to enable the Tungsten plugin", false, 
ConfigKey.Scope.Zone, null);
 
+    static final ConfigKey<Boolean> NSX_ENABLED = new 
ConfigKey<>(Boolean.class, "nsx.plugin.enable", "Advanced", "false",
+            "Indicates whether to enable the NSX plugin", false, 
ConfigKey.Scope.Zone, null);
+
     List<? extends Network> setupNetwork(Account owner, NetworkOffering 
offering, DeploymentPlan plan, String name, String displayText, boolean 
isDefault)
         throws ConcurrentOperationException;
 
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 211125227e7..d01f39543e4 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
@@ -4675,6 +4675,6 @@ public class NetworkOrchestrator extends ManagerBase 
implements NetworkOrchestra
         return new ConfigKey<?>[]{NetworkGcWait, NetworkGcInterval, 
NetworkLockTimeout,
                 GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion,
                 PromiscuousMode, MacAddressChanges, ForgedTransmits, 
MacLearning, RollingRestartEnabled,
-                TUNGSTEN_ENABLED };
+                TUNGSTEN_ENABLED, NSX_ENABLED };
     }
 }