Skip to content

Commit 0438189

Browse files
committed
fix offering
1 parent d9612b7 commit 0438189

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ public List<String> getSupportedServices() {
297297
SourceNat.getName(),
298298
PortForwarding.getName()));
299299
}
300-
if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris"))) {
300+
if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris") &&
301+
NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()))) {
301302
services.add(Lb.getName());
302303
}
303304
if (Boolean.TRUE.equals(forVpc)) {
@@ -410,7 +411,8 @@ private void getServiceProviderMapForExternalProvider(Map<String, List<String>>
410411
else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()) || NetworkACL.getName().equalsIgnoreCase(service)) {
411412
serviceProviderMap.put(service, List.of(provider));
412413
}
413-
if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
414+
if (("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) ||
415+
("Netris".equalsIgnoreCase(provider) && NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode()))) {
414416
serviceProviderMap.remove(Lb.getName());
415417
}
416418
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ public List<String> getSupportedServices() {
194194
if (NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode())) {
195195
supportedServices.add(Gateway.getName());
196196
}
197-
if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris"))) {
197+
if (getNsxSupportsLbService() || (provider != null && provider.equalsIgnoreCase("Netris") &&
198+
NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMode()))) {
198199
supportedServices.add(Lb.getName());
199200
}
200201
}
@@ -259,7 +260,8 @@ else if (NetworkOffering.NetworkMode.NATTED.name().equalsIgnoreCase(getNetworkMo
259260
serviceProviderMap.put(service, List.of(provider));
260261
}
261262
}
262-
if ("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) {
263+
if (("Nsx".equalsIgnoreCase(provider) && !getNsxSupportsLbService()) ||
264+
("Netris".equalsIgnoreCase(provider) && NetworkOffering.NetworkMode.ROUTED.name().equalsIgnoreCase(getNetworkMode()))) {
263265
serviceProviderMap.remove(Lb.getName());
264266
}
265267
}

0 commit comments

Comments
 (0)