[cloudstack] branch nsx-integration updated: change provider to VPC router for Dhcp & dns service in an nsx offering

[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 b2d34e65a70 change provider to VPC router for Dhcp & dns service in an 
nsx offering
b2d34e65a70 is described below

commit b2d34e65a704fbf736a3af404c279a48a42608db
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Tue Oct 3 07:25:42 2023 -0400

    change provider to VPC router for Dhcp & dns service in an nsx offering
---
 server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java     | 2 +-
 server/src/main/java/com/cloud/server/ConfigurationServerImpl.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java 
b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
index e0fc5561c5e..07e807dd3c5 100644
--- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -373,7 +373,7 @@ public class VpcManagerImpl extends ManagerBase implements 
VpcManager, VpcProvis
                     final Map<Service, Set<Provider>> svcProviderMap = new 
HashMap<Service, Set<Provider>>();
                     final Set<Provider> defaultProviders = 
Set.of(Provider.Nsx);
                     for (final Service svc : getSupportedServices()) {
-                        if (svc == Service.UserData) {
+                        if (List.of(Service.UserData, Service.Dhcp, 
Service.Dns).contains(svc)) {
                             final Set<Provider> userDataProvider = 
Set.of(Provider.VPCVirtualRouter);
                             svcProviderMap.put(svc, userDataProvider);
                         } else {
diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java 
b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
index 6bcf6d3442b..afa3a0c7e41 100644
--- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
@@ -1000,8 +1000,8 @@ public class ConfigurationServerImpl extends ManagerBase 
implements Configuratio
         
defaultTungstenSharedSGNetworkOfferingProviders.put(Service.SecurityGroup, 
Provider.Tungsten);
 
         final Map<Network.Service, Network.Provider> 
defaultNSXNetworkOfferingProviders = new HashMap<>();
-        defaultNSXNetworkOfferingProviders.put(Service.Dhcp, Provider.Nsx);
-        defaultNSXNetworkOfferingProviders.put(Service.Dns, Provider.Nsx);
+        defaultNSXNetworkOfferingProviders.put(Service.Dhcp, 
Provider.VPCVirtualRouter);
+        defaultNSXNetworkOfferingProviders.put(Service.Dns, 
Provider.VPCVirtualRouter);
         defaultNSXNetworkOfferingProviders.put(Service.SourceNat, 
Provider.Nsx);
         defaultNSXNetworkOfferingProviders.put(Service.UserData, 
Provider.VPCVirtualRouter);