Skip to content

Commit d9612b7

Browse files
committed
Add LB service to Custom VPC/Network offerings
1 parent 7d59bfe commit d9612b7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public List<String> getSupportedServices() {
297297
SourceNat.getName(),
298298
PortForwarding.getName()));
299299
}
300-
if (getNsxSupportsLbService()) {
300+
if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris"))) {
301301
services.add(Lb.getName());
302302
}
303303
if (Boolean.TRUE.equals(forVpc)) {
@@ -410,7 +410,7 @@ private void getServiceProviderMapForExternalProvider(Map<String, List<String>>
410410
else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()) || NetworkACL.getName().equalsIgnoreCase(service)) {
411411
serviceProviderMap.put(service, List.of(provider));
412412
}
413-
if (!getNsxSupportsLbService()) {
413+
if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
414414
serviceProviderMap.remove(Lb.getName());
415415
}
416416
}

api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public List<String> getSupportedServices() {
194194
if (NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode())) {
195195
supportedServices.add(Gateway.getName());
196196
}
197-
if (getNsxSupportsLbService()) {
197+
if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris"))) {
198198
supportedServices.add(Lb.getName());
199199
}
200200
}
@@ -259,7 +259,7 @@ else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMo
259259
serviceProviderMap.put(service, List.of(provider));
260260
}
261261
}
262-
if (!getNsxSupportsLbService()) {
262+
if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
263263
serviceProviderMap.remove(Lb.getName());
264264
}
265265
}

0 commit comments

Comments
 (0)