You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2025/08/07 14:08:32 UTC
(cloudstack) 01/01: Add LB service to Custom VPC/Network offerings
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
commit d9612b723b49fad6453856eb70a81a15d42a01ac
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Thu Aug 7 10:06:09 2025 -0400
Add LB service to Custom VPC/Network offerings
---
.../api/command/admin/network/CreateNetworkOfferingCmd.java | 4 ++--
.../apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java | 4 ++--
2 files changed, 4 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 51ba6ec02ea..c7825389059 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,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
SourceNat.getName(),
PortForwarding.getName()));
}
- if (getNsxSupportsLbService()) {
+ if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris"))) {
services.add(Lb.getName());
}
if (Boolean.TRUE.equals(forVpc)) {
@@ -410,7 +410,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()) || NetworkACL.getName().equalsIgnoreCase(service)) {
serviceProviderMap.put(service, List.of(provider));
}
- if (!getNsxSupportsLbService()) {
+ if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
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 84f4d451460..4a6dc55dc86 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,7 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
if (NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode())) {
supportedServices.add(Gateway.getName());
}
- if (getNsxSupportsLbService()) {
+ if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris"))) {
supportedServices.add(Lb.getName());
}
}
@@ -259,7 +259,7 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
serviceProviderMap.put(service, List.of(provider));
}
}
- if (!getNsxSupportsLbService()) {
+ if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
serviceProviderMap.remove(Lb.getName());
}
}