(cloudstack) branch netris-net-offerings-lb updated: fix offering

[pearl11594]

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

pearl11594 pushed a commit to branch netris-net-offerings-lb
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/netris-net-offerings-lb by 
this push:
     new 04381891326 fix offering
04381891326 is described below

commit 043818913266b2afc097b9d1949d9df19d2d3f14
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Thu Aug 7 10:51:04 2025 -0400

    fix offering
---
 .../api/command/admin/network/CreateNetworkOfferingCmd.java         | 6 ++++--
 .../cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index c7825389059..15aaf479eaf 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -297,7 +297,8 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
                         SourceNat.getName(),
                         PortForwarding.getName()));
             }
-            if (getNsxSupportsLbService() || (provider != null && 
provider.equalsIgnoreCase("Netris"))) {
+            if (getNsxSupportsLbService() || (provider != null && 
provider.equalsIgnoreCase("Netris") &&
+                    
NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()))) {
                 services.add(Lb.getName());
             }
             if (Boolean.TRUE.equals(forVpc)) {
@@ -410,7 +411,8 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
             else if 
(NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()) 
|| NetworkACL.getName().equalsIgnoreCase(service)) {
                     serviceProviderMap.put(service, List.of(provider));
                 }
-            if ("Nsx".equalsIgnoreCase(provider) && 
!getNsxSupportsLbService()) {
+            if (("Nsx".equalsIgnoreCase(provider) && 
!getNsxSupportsLbService()) ||
+                    ("Netris".equalsIgnoreCase(provider) && 
NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode()))) {
                 serviceProviderMap.remove(Lb.getName());
             }
         }
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 4a6dc55dc86..4bfcf33cb3e 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -194,7 +194,8 @@ public class CreateVPCOfferingCmd extends 
BaseAsyncCreateCmd {
             if 
(NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode())) {
                 supportedServices.add(Gateway.getName());
             }
-            if (getNsxSupportsLbService() || (provider != null && 
provider.equalsIgnoreCase("Netris"))) {
+            if (getNsxSupportsLbService() || (provider != null && 
provider.equalsIgnoreCase("Netris") &&
+                    
NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()))) {
                 supportedServices.add(Lb.getName());
             }
         }
@@ -259,7 +260,8 @@ public class CreateVPCOfferingCmd extends 
BaseAsyncCreateCmd {
                 serviceProviderMap.put(service, List.of(provider));
             }
         }
-        if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
+        if (("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) ||
+                ("Netris".equalsIgnoreCase(provider) && 
NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode()))) {
             serviceProviderMap.remove(Lb.getName());
         }
     }